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

How to fix a merge conflict on a directory?

From: David Aldrich <David.Aldrich_at_EMEA.NEC.COM>
Date: Mon, 29 Apr 2013 07:21:18 +0000


As a result of merging from trunk to a branch using a 1.7 svn client. Several directories now have conflicts. For example, directory 'Documents' contains dir_conflicts.prej, which contains:

Trying to delete property 'svn:mergeinfo'
but the local property value is different.
<<<<<<< (local property value)

>>>>>>> (incoming property value)

How do I resolve this type of conflict please?

Received on 2013-04-29 09:22:13 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.