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

Re: comments inserted on merge

From: Lübbe Onken <luebbe.tortoisesvn_at_googlemail.com>
Date: Thu, 14 Jan 2010 08:54:25 +0100

Hi Brett,

you wrote:
> No but it seems like I have resolved all the conflicts in files and then those comments still remained in the file after I saved the merged changes and marked them as resolved. I believe that is correct, anyway. Maybe I am wrong and there were still conflicts remaining.

It is also possible that the conflict markers were left in the file
before it got committed before. You can use annotate/blame to check if
this was the case. If you just mark a file as resolved without actually
resolving all conflicts, the conflict markers will stay in the file.

- Lübbe

  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net  PGP Key ID 0x23F511AB
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-01-14 08:54:40 CET

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.