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 git. Hence I do not need any tips on git alone, but directly on the workflow with git-flow. Here is the situation: When I relase a version (let's call it 1.0), this get's branched of develop, which is fine. Let's say now I start working on 2.0, adding new features. And of course I want to merge them back onto develop, once I am done. Now hotfixing on 1.0 is fine, so let's also say I produce several

From my understanding one of the advantages of creating feature branches is so that you can easily see where large groups of commits have been merged into the develop branch. Upon finishing a feature branch the recommendation is to delete the feature branch since it is no longer needed for development. Once the branch has been deleted, will the graph still be annotated with "feature/my-fancy-feature" branched and merged? "Upon finishing a feature branch the recommendation is to delete the feature branch since it is no longer needed for development." Difference between "discarding" and "merging

I'm using the "Git Flow" branching model, with a master branch and a develop branch. I'm working on a major new release, so my develop branch is wildly different from my master branch. This creates a problem anytime I need to make a hotfix on the master branch and merge it back into develop. There are almost always conflicts, and it's becoming a real pain. What is the best way to manage this? It would be easier for me to make the small hotfix changes on develop manually and then merge everything into master when I'm ready without merging master back into develop. Is this possible? The simplest

If you try to follow the git-flow branching model, documented here and with tools here , how should you handle this situation: You have made a 1.0 release and a 2.0 release. Then you need to make a hotfix for 1.0. You create a hotfix branch off the 1.0 tag and implement the fix there. But what then? Normally you would merge to master and put a 1.1 release tag there. But you can't merge 1.1 to a point after 2.0 on master. I guess you could put the release tag on the hotfix branch, but that would create a permanent branch beside the master that would contain a release tag. Is that the right way?

Our development team has been using the GitFlow branching strategy and it has been great ! Recently we recruited a couple testers to improve our software quality. The idea is that every feature should be tested/QA by a tester. In the past, developers work on features on separate feature branches and merge them back to the develop branch when done. The developer will test his work himself on that feature branch. Now with testers, we start asking this Question On which branch should the tester test new features ? Obviously, there are two options: on the individual feature branch on the develop