How to use git

[Dr M J Carter]

On Sun, Aug 21, 2016 at 01:44:55PM +1000, Ian Wadham wrote:

> If you are going to fix a bug, you need to retrieve the new branch
> from central and make the same fix in two branches.  I can never
> remember exactly how to do that… ;-)

Commit the fix in one branch, and cherry-pick that commit into the
other .... ?  That way, git knows not to reapply the commit if/when
said branches are merged later.

-- 
Dr Martin J Carter
Computer System Administrator
Astrophysics, University of Oxford