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

RE: Modified (properties only)

From: David Aldrich <David.Aldrich_at_EMEA.NEC.COM>
Date: Thu, 10 Nov 2011 17:12:54 +0000

> If it is a file, you can AFAIK safely remove the mergeinfo property from the
> file .

Thanks, it is a file. I have removed the property in the trunk. I then merged the trunk into my branch whereupon I got a conflict for that file. So I just deleted the mergeinfo property in the branch, marked the file as resolved and committed the branch.

Not sure if that was the right thing to do. It may reoccur next time I merge, I guess.

Received on 2011-11-10 18:14:28 CET

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.