Merge or Cherry-Pick?

[Parker Coates]

On Wed, Feb 2, 2011 at 08:25, David Jarvie  wrote:
> I'd recommend maintaining a local 'master' branch which always mirrors the
> remote repository. Never do development in your local 'master' branch -
> always do your work in other local branches, and only merge/cherry-pick
> changes from them into the local 'master' once you are ready to push to
> the remote. That way, your local master always mirrors the remote, and you
> can choose exactly when and which commits to push.

Note to self: Always check that there are no new messages in the
thread before pressing Send.

Parker