marcmeans Posted May 17, 2012 Report Share Posted May 17, 2012 I'm newer to the DVCS model of branching and merging. Most of my experience has been around the sequential model of CVS/Subversion. I am familiar with Git/Mercurial and am looking at plastic. I'm still struggling to find a decent explanation of how to approach the branch per feature workflow. My goal is to understand it well enough that I can teach the topic to my team. I'm going to lay some questions out, I believe I understand the answers to some of them, but would rather have a fresh answer than the assumption I have behind them. 1. For a smaller team that is used to working in a sequential style repository, why would I want to move to branches? We only release when all the planned features are released anyway. 2. If I branch and have dependencies in my branch that another developer needs to work with for their story, how do we share that code and cleanly merge it back to the main line? 3. Should we be merging each feature back to mainline once it's complete, or having an integration developer pull those changes into mainline? If we're moving to a new sprint, how do we ensure we're working on the latest code base going forward? 4. (More specific to plastic) Once i've branched and merged for a few months and have a branch explorer that looks like a large tangle, is there a way to isolate the explorer so we can 'ignore' the past visually and focus on the last few sprints and upcoming work? Thanks in advance for anyone who can chime in. Marc Link to comment Share on other sites More sharing options...
This topic is now archived and is closed to further replies.