Skip to main content
Software Engineering

You are not logged in. Your edit will be placed in a queue until it is peer reviewed.

We welcome edits that make the post easier to understand and more valuable for readers. Because community members review edits, please try to make the post substantially better than how you found it, for example, by fixing grammar or adding additional resources and hyperlinks.

Required fields*

4
  • 2
    We use this branching model, but I think if you read "feature branch" as "story branch", it jives really well with your second article. Commented Dec 25, 2011 at 16:44
  • 2
    I'm sure 10 people could respond back to this with 10 different responses. Here is what works for me: We have one master repo hosted on github which denotes the 'current' release. Older releases are branched (though tagging works too). Team members are encouraged to create branches for tasks they are working on. When complete, they make a pull request to master (or where ever it needs to merge to) and then someone else reviews the pull request and is reponible to merge it into master. They are also responsible for clearing out the branch once it has been merged. Commented Dec 25, 2011 at 16:50
  • 2
    You might be interested in submodules to keep the different teams' codebases apart. They can then fork each others' codebases and send patches around when editing each others' parts of the code. Commented Dec 25, 2011 at 16:57
  • @larsmans & carbonbasednerd - Your comments should have been answers, they would have got up-votes from me. *8') Commented Jan 4, 2012 at 17:48