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

Merge not recognizing conflicts?

From: Choate, Bryan \(IHG\) <Bryan.Choate_at_ihg.com>
Date: 2007-03-16 15:27:54 CET

When running a merge from, say, the trunk to a branch, I've seen this
behavior a couple of times and so have others on my team. Basically I
resolve all the conflicts that Tortoise shows me in the merge list, and
then close and try to commit. Low and behold, there are other files
still in a conflicted state that the merge results didn't recognize.
We're using 1.4.2... any thoughts on why this is happening?




Bryan Choate

IHG - http://www.ihg.com

Intercontinental Hotels Group

Received on Fri Mar 16 15:28:49 2007

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

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