[cvsnt] More merging problems

Tony Hoyle tmh at nodomain.org
Mon Feb 16 16:11:37 GMT 2004


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.


On Mon, 16 Feb 2004 15:07:20 -0000, "Harrison, Andrew"
<andy.harrison at anite.com> wrote:


>
>When I merged Branch2->Branch1 it undid the changes from HEAD (1.1-1.2).
>Surely this is wrong?
>
Hmm...  That's a fairly odd combination of updates but it is a bug.
It really shouldn't do any merge at all (since the branch isn't live
yet).

It'll be fixed in the next release.

Tony




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