Stack Overflow
Stack Overflow

Questions tagged [git-flow]

The git-flow workflow defines a strict branching model designed around a project release. It provides a robust framework for managing larger projects. Use this tag for help with applying git-flow to your workflow, or for help with the supporting scripts (either the original scripts or the AVH Edition).

A workflow and a series of scripts for tagging and branching a development project that uses the Git distributed version control system.

The original scripts have not been updated since 2012. An updated fork of the scripts is git-flow AVH Edition, maintained by Peter van der Does.

1079 questions
20
votes
1 answer

what is support command in git flow

I know what are bugfix, hotfix and feature branches. But the thing that I can't grasp is support command as git flow support start could someone explain this command with a simple scenario?
Mehrdad Shokri
  • 1,974
  • 2
  • 29
  • 45
20
votes
3 answers

After merge of release branch, why is master 1 commit ahead of develop?

I am still new to this so I am trying to understand why master ends up 1 commit ahead of develop instead of the same after merging a release branch back into develop and master. My develop branch was 5 commits ahead of master, then I created a…
OutOFTouch
  • 1,017
  • 3
  • 13
  • 30
20
votes
3 answers

Removing features from releases in Git Flow

I work on a team with a large Java code base (300k+ lines of code), which recently adopted Git as the source control (migrated from ClearCase). We are using Git Flow as our branching strategy. There are a couple of use cases that we come across…
NickForrer
  • 285
  • 1
  • 3
  • 7
20
votes
8 answers

Looking for a way automate the "bump version" with git flow

I have been using git flow for a couple of months and it has worked very well. I would like to automate the "bump version" operation. The project is PHP and the footer.php has a token to replace with the current release tag. I am certain that…
spdaly
  • 1,260
  • 2
  • 18
  • 35
19
votes
1 answer

Git workflow for maintaining a derivative fork

Overview I have a project that is a customisation of an existing FOSS product. Its getting to the point where we're maintaining a long-term fork rather than applying new plugins and the like. I'd like some input on what the sanest workflow for…
jhogendorn
  • 5,931
  • 3
  • 26
  • 35
19
votes
2 answers

Why doesn't "git flow feature pull" track?

Lets say I've created a new feature with git flow feature start FEATURENAME then published it with git flow feature publish FEATURENAME Now my colleague wants to collaborate on this feature with me, so he does git flow feature pull FEATURENAME This…
OpherV
  • 6,787
  • 6
  • 36
  • 55
18
votes
1 answer

Value and usage of Git-Flow's tag-prefix feature?

I've been using git-flow for a while but I still don't understand the Tag Prefix feature. I assume it's just a string that prefixes every release/ tag. Does anyone have any usage examples or benefits of doing this? I've yet to see any explanation of…
Christian Schlensker
  • 21,708
  • 19
  • 73
  • 121
18
votes
2 answers

Git: How to cherrypick commit from one branch and create pull request for another branch?

I have two branches dev & master. I am using bitbucket. I need to cherrypick some of the commit from dev branch. Then need to create pull request for the master branch. As my dev environment has so many things, some of them not able to directly…
Mighty
  • 317
  • 1
  • 2
  • 11
18
votes
2 answers

Handle git branching for test and production

When working with git (flow) and having a stage/test environment where the customer are doing their reviews of the things developed what is the best way of handling features that aren't approved along with features that are? Consider the scenario…
Hyzac
  • 475
  • 3
  • 16
18
votes
2 answers

How do you release a bugfix to a previous version and tag it?

We are trying to adopt gitflow into our process at work. Gitflow is pretty simple when it comes to hotfixes. However, I'm unclear on how I would fix a bug on a previous version of our system. For example, let's just say we're on version 8.1.3 and I…
Robert
  • 667
  • 7
  • 15
18
votes
2 answers

git flow releasing selected features

I am trying to introduce Git flow to my team. We are a fairly small team and quite agile. We want to release once a day and this means we have limited time towards testing all the changes in the day. Business team wants to be able to control the…
dark_src
  • 486
  • 5
  • 11
17
votes
1 answer

How does git flow handle hotfix to older release or point release of older release

How does git flow handle a hotfix after master has move far beyond that release? Scenario Work for 1.0 performed on develop, stabilized on releases/v1.0 release branch and pushed to master in fast-forward merge with tag v1.0 pointing to tip of…
Peter Kahn
  • 12,364
  • 20
  • 77
  • 135
17
votes
3 answers

git flow - how to start working on existing feature branch

I would like to start working on another developer's feature branch (we use git and git flow). AFAIK The branch has been published (pushed). How can I get it to my local repository? I tried: git flow feature pull origin/XXXXXX-1003b fatal:…
FazoM
  • 4,777
  • 6
  • 43
  • 61
16
votes
3 answers

git-flow: how to checkout release branch from origin?

What is the perferred workflow to pull a published release branch from the central repo using git-flow? eg: Mike made a release branch, he published it through "git flow release publish 1.0" Jane would like to work on that release branch too, how…
ChrisR
  • 14,370
  • 16
  • 70
  • 107
16
votes
2 answers

Commit to develop branch directly in Git Flow?

I'm currently migrating a project to Git Flow and I'm really appreciated the flexibility it provides. The problem is, in the following situations, may I working on and commit to a development branch directly? a minor typo fix, or a small…
Mengdi Gao
  • 780
  • 8
  • 23
1 2 3
…
71 72