[cvsnt] Unable to resolve merge conflicts

Tony Eva teva at Airspan.com
Tue Aug 1 09:15:23 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.

Gerhard Fiedler wrote:

> That's correct. The file is reported as having a conflict 
> until you commit.  [ ... ] Committing is the recommended
> way to clear the "conflict" status.

Ouch.  That's a big difference from the way that CVS behaves,
and (IMHO) not an improvement.  CVS uses the conflict status
to indicate that the file has *unresolved* conflicts, and it
uses the timestamps on the file to determine whether it has
been edited and (implicitly) the conflict resolved; thus when
a file with "conflict" status is edited and saved, the status
automatically reverts to "modified".

This is really handy when you have a large number of
conflicts following a major merge - the "conflict" status
can be used to keep track of which files have been sorted
out.  Yes, one could commit each resolved file individually
but that takes away the capability of using the commit ID
to find all files in a single commit.

It also serves a very valuable function in CVS of guarding
against accidental commits of unresolved conflicts, which
(on the face of it) CVSNT seems to have taken away.

I would really like at the very least to have the ability
to reset the conflict status *before* committing.


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