git-flow is a popular workflow that extends the verbs available to git and helps handle moving changes between feature, development, release, hotfix, support, and production branches.
28
votes
1answer
11k views
Git create a branch from another branch
I'm getting crazy with Git :)
I have 2 branches : master and dev
I want to create a "feature branch" from the dev branch
Currently On branch dev, I do :
$ git checkout -b myfeature dev
... ...
22
votes
4answers
6k views
Who is successfully using git-flow? [closed]
Are any large software projects using git-flow and, if so, how is it going?
(See http://nvie.com/posts/a-successful-git-branching-model/ and ...
18
votes
1answer
2k views
Using git-flow in a multi-stage deployment
Drawing a blank with finalizing my deploy scheme here. After posting this question: Migrating a production site with no VCS at all to Git, I've got the gist of deploying to a local repo down.
My ...
10
votes
3answers
2k views
git flow - how do I pause development on one feature to work on another
I'm new to git and git flow. I've read all the various pages, blogs, and stackoverflow questions on it,and have been using it in my daily development.
But one issue has been bothering me, I just ...
10
votes
3answers
2k views
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 ...
9
votes
2answers
142 views
Maven: Bind plugin execution to the execution of another plugin, not to a lifecycle phase
Note regarding the accepted answer: I accepted the answer because of strong circumstantial evidence. Nonetheless, this is circumstantial evidence, so take it with a grain of salt.
How can I have a ...
8
votes
5answers
3k views
Is there any IDE/GUI support for git-flow on Windows/Linux?
Are there any GUI frontends for Git with git-flow support?
Our team uses Eclipse IDE on Windows and Linux.
Managed to gradually infect them with git-svn, now looking for the next steps to harness ...
8
votes
2answers
3k views
git flow branches have diverged
I'm using the git flow tools and I've gotten myself in a bit of problem. My git branches have diverged. I've read master branch and 'origin/master' have diverged, how to 'undiverge' ...
7
votes
3answers
3k views
git workflow and gerrit
I am trying to implement a 'git-flow' kind of workflow using Gerrit but I can't seem to figure out the last piece of the puzzle.
There are two preconditions to my problem:
Gerrit will only perform ...
7
votes
2answers
2k views
Multiple development branches with git-flow
I am currently looking a lot into git-flow, and trying to figure out, how to use it for the projects I am involved on.
I have looked at the various git-flow tutorials and I am fairly familiar with ...
7
votes
1answer
548 views
Git branching stategy for feature branches and common code
I've been using the git branching strategy outlined here http://nvie.com/posts/a-successful-git-branching-model/
So far its been working really well for me.
The question I often find my self asking ...
6
votes
1answer
1k views
Merging Git Flow Feature Branch after Hotfixes?
I just recently started using git flow and there's something I don't quite understand. First, I never do anything directly on develop. If I do something I either use a start a hotfix or feature.
My ...
6
votes
1answer
946 views
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 ...
5
votes
2answers
477 views
Git flow branching for fixin bug
I have been using git flow for a while. I was searching for branching model for fixing issues and bugs found in the develop branch. I know we could use hotfix but it is for master branch, or quick bug ...
5
votes
1answer
363 views
How to undo git flow feature finish?
I am learning git-flow and I just did git flow feature finish <feature-name>, which merged my feature branch to develop and removed it.
Instead of this, I want to push the feature branch to ...
