[cvsnt] Force conflict

Gabriel Genellina gagenellina at softlab.com.ar
Mon Dec 27 23:01:53 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.


Is there a way to do the following?:
I want that *any* time a merge is needed, it's marked as a conflict.
I don't want any automatic merges, no matter how trivial they would be; I 
want all merges resolved by the developers.
In other words, if I modify a file in my sandbox and another user commited 
a new revision, when I do a cvs update I want it to be flagged as a 
conflict, even if the modified lines are far apart.
(You may think it's a bit paranoic -maybe- but we have good reasons to 
review all changes before merge)

Gabriel Genellina
Softlab SRL 

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