-
Notifications
You must be signed in to change notification settings - Fork 2
-
How to convert existing git repository to use git-flow?
Run git flow init from the repository folder just like as you would do for new repository
-
Can I still do manual branches and merges when I use git-flow?
Of course you can.git-flow
does not forbid you to keep using vanilla Git commands!So if you want to merge
master
intodevelop
for whatever reason you want to, you can safely do so without breakinggit-flow
compatibility. Do you want to manually merge a feature branch X into another feature branch Y? Not a problem. As long as you do it consciously and realize what this means for finishing those branches later on. -
Why does git-describe not work for me?
When finishing release and hotfix branches, that branch's HEAD is first merged intomaster
and then intodevelop
. It is not the resulting new merge commit frommaster
that is merged back intodevelop
. This means that a linear path from the newdevelop
branch to the newmaster
commit is not created. Even worse, a linear path is created from the newdevelop
branch to the previousmaster
commit. Although unintended, this is simply an effect of using the current branching rules.When using
git-describe
in these cases, you can get very confusing and misleading results, sincegit-describe
scans the current commits linear history for the most recent tag it finds, which will always be the previous tag.If your project uses Maven, then buildversion-plugin may be your ticket.
I will change this behaviour in the next version of the branching model explicitly and I will include this behavioural change in the first version of the Python rewrite.
For more references to this problem, see:
- Issue #49
- These two discussions on the git-flow-users mailinglist.
- Explanation and more references at buildversion-plugin's README
-
Can I use it with Windows?
There have been reports of Windows users usinggit-flow
.Unfortunately, I have no Windows environment to test it on, but this issue should be helpful in setting it up. -
How does it integrate with Gerrit?
? -
What is the 'support' branch?
It's an experimental feature that is currently being worked on. When you try using it you'll get warnings telling you not to use it in production. It essentially allows you to fork master, but once it's forked it stays forked. It has been speculated (on the blog) that this is if you have a client that has a very specific request which you wouldn't every want to use outside of that one client's version of the project. I imagine we will hear more about it when it's ready.