[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: 'svn update' command, in case of conflict, should leave the version with unchanged conflicting parts

From: Yuri <yuri_at_rawbw.com>
Date: Mon, 20 Jan 2014 16:52:14 -0800

I would make a correction here: conflicting parts could be marked up in
a different fashion:
<<<<<<< begin conflict
<... section of mine with conflicting changes...>
>>>>>>> end conflict

Otherwise it is difficult to tell where the conflict is. Maybe you can
name the file <file name>.conflicts

Yuri
Received on 2014-01-21 01:52:48 CET

This is an archived mail posted to the Subversion Users mailing list.