branching-strategy

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

I am trying to decide on the best branching strategy for a web application project. Here is what I have come up with until now and I would greatly appreciate any comments and experiences. The way I see it there are two main branching strategies: "branch by release" and "branch by feature". "Branch by release" : Development takes place on the trunk. When the time for a release is near, a branch is made for that release. This branch is then stabilized/tested and finally a release is made. After the release, the branch is merged back into the trunk, while keeping the release branch alive for bug

I'm using Git for one of my projects at the moment, and I love it. However, because I'm the only one working on my project, the only commands I've been using are git status git add . git commit -m 'message here' git push origin master I have pushed the project to remote a long time ago ago (I Capistrano for deployment), and all is working great. Now I want to change the design of the site, but keep the logic intact. I'm guessing I need to create a new branch (let's call it newdesign ) for that. What I'm wondering, though, is this: if I'm working on the newdesign branch, and I see a bug in the

The company I work for is starting to have issues with their current branching model and I was wondering what different kinds of branching strategies the community has been exposed to? Are there any good ones for different situations? What does your company use? What are the advantages and disadvantages of them?? Here is the method I've used in the past with good success: /trunk - bleeding edge. Next major release of the code. May or may not work at any given time. /branches/1.0, 1.1, etc. Stable maintenance branches of the code. Used to fix bugs, stabilize new releases. If a maintenance