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*

5
  • +1 Great technical answer, might work if he does not document it, probably won't. Problem is not likely to be fully solved unless the branching stratagy is documented with clear procedures. Commented Sep 5, 2013 at 4:53
  • 1
    @mattnz There are more advanced branching (ghads, I'm going to use the word) patterns. However, the 'everyone commit to dev always' and 'when ready, branch a release from dev' should get you 90% of the way to the solution. Then the only oddball cases are the 'working on a patch' and then its a "I know I'm doing this on an old release, switch to that branch". Commented Sep 6, 2013 at 19:10
  • 1
    I've accepted this answer as it will form the basis of changes we are going to make to our SCM. The links to Advanced SCM Branching Stratagies and the git-flow model have been particularly appreciated. We'll also try and invest in training to improve our developers understanding of what they do with HG. Commented Sep 10, 2013 at 12:22
  • @imp25 you may find hg-flow useful for the hg side rather than git. Commented Sep 10, 2013 at 12:28
  • @imp25 (and some StackOverflow questions and answers about hgflow - stackoverflow.com/questions/14011921/… stackoverflow.com/questions/13021807/… ) Commented Sep 10, 2013 at 14:10