Merging from staging to master

[Mark McLoughlin]

On Tue, 2009-09-15 at 16:54 -0500, Mike McGrath wrote:
> This has bugged me forever and I think I've got it figured out now (thanks
> mdomsch for pointing me in the right direction)
> 
> Lets say you've been working for weeks on a module in staging and you want
> to cherry pick those commits.  How do you do it?  It becomes trickier even
> if someone else has been working on other modules in staging.

It's probably better to have a topic branch for your changes and merge
that regularly into staging while you're working on it. When it's all
done, you can merge the topic branch into master.

Cheers,
Mark.