On Wed, Sep 24, 2008 at 13:02, TomSW <[EMAIL PROTECTED]> wrote:
> I am looking into how to apply git to some current working methods.
> We tend to have two or three main branches: the development branch,
> and one or two product branches. The development branch is the cutting
> edge, and each product branches off from it.
> While the product branch shares history with the development branch,
> not all changes to the development branch will get applied to the
> product branch. We tend to maintain two versions of a product at any
> time, meaning two divergent product branches.
> Could we use git, or a tool based on git, to change on the development
> branch and selectively apply changes to the other branches - is it as
> simple as using git cherry-pick?

Cherry pick should do that, but I don't think it would work as well as
regular merges.  It would still require a fair amount of work to
maintain what you want to move.  It sounds like it might help to alter
your flow somewhat.  It sounds like you should consider having dev
branches for each of your products too.  And put changes that should
only go to one product on those.

It might also help to rearrange your tree so that forked code is in
different directories of the same branch rather than in the same
directory on different branches.

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 [EMAIL PROTECTED]
For more options, visit this group at 

Reply via email to