[cvsnt] Merge-Problem: nonmergeable file needs merge

Johannes Kilian Jo.Kilian at gmx.de
Mon Sep 8 13:48:09 BST 2003

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.

Hi there,

during a merge (from branch to HEAD) I got the following error message
(concerns a lot of files):
cvs server: PositionOffset.xml: permission mismatch between 1.1 and
cvs server: nonmergeable file needs merge
cvs server: revision from repository is now in
cvs server: file from working directory is now in .#PositionOffset.xml.1.1
C config/scan/PositionOffset.xml

Where does this message come from? My first thought was: the original file
was write-protected before merge - but this wasn't true (In a second
merge-attempt I recursively removed all write-protection flags before merge, but the
effect was the same)

Any idea when this message occurs - and what to do to avoid it?



COMPUTERBILD 15/03: Premium-e-mail-Dienste im Test
1. GMX TopMail - Platz 1 und Testsieger!
2. GMX ProMail - Platz 2 und Preis-Qualitätssieger!
3. Arcor - 4. web.de - 5. T-Online - 6. freenet.de - 7. daybyday - 8. e-Post

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