[cvsnt] Re: Branch merging - this seems wrong...

Gerhard Fiedler lists at connectionbrazil.com
Thu Jun 8 01:34:25 BST 2006

Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.

Andreas Krey wrote:

>> I really think that both approaches (Tony Hoyle's comments about merge
>> points and our need to have temporary development branches that stay in
>> sync with the main development branch) converge in my suggestion to only
>> merge from A to B, and after the final merge from A to B, /copy/ B to A.
> When we're going to abandon B afterwards this is a valid workaround
> (and the reason for that is the symmetry mentioned above).

That was my point (end of life for the branch).

> Continuing to merging from A to B, however, will lead to false conflicts,
> because cvsnt doesn't know that everything from B is also in A and will
> merge it right back into B.

Just start a new branch at that point. 


More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook