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

Re: Merge not recognizing conflicts?

From: Stefan Kng <tortoisesvn_at_gmail.com>
Date: 2007-03-21 18:35:36 CET

Choate, Bryan (IHG) wrote:
> When running a merge from, say, the trunk to a branch, Ive 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 didnt recognize.
> Were using 1.4.2 any thoughts on why this is happening?

If you can reproduce this, then please report this on the Subversion
mailing list.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Mar 21 18:35:45 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.