On Friday, August 26, 2011, gitlist <gitl...@myword.co.uk> wrote:
> Thanks for the reply. It's not really bugfixes that's the issue, it's how
to handle overlapping development of two features. Feature 1 is being tested
by the customer; I need to start work on Feature 2. But where to begin the
Feature 2 branch?

I would think master, or the most "stable" point that has all the changes
Feature 2 needs.

> What I've realised today is that it's quite possible that Feature 2 (much
simpler) could be tested and deployed long before Feature 1 - IOW overtake
it. I can't risk any of the unfinished code from Feature 1 going on the
production server, so I have to start Feature 2 from the current master, as
deployed, even if that means having to pull out some work which is on the
Feature 1 branch.
> I suppose I should not have allowed so much work to build up on the
Feature 1 branch.

Indeed, it sounds like in hindsight that work wasn't really part of Feature
1, and maybe should have been on its own branch.



You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
For more options, visit this group at 

Reply via email to