Terminology for referring to branches during merges and conflicts

Stephen J. Turnbull stephen at xemacs.org
Mon Jan 18 15:20:32 GMT 2010


Michael Gliwinski writes:

 > BASE it could be something along the lines of '(NICK @ REV)' where obviously 
 > REV is that common ancestor revision?

Er, by definition it's on both branches.  Which nick?




More information about the bazaar mailing list