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

RE: Re: comments inserted on merge

From: Brett Sturgis <bsturg21_at_gmail.com>
Date: Wed, 13 Jan 2010 13:09:20 -0800 (PST)

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.

> Brett Sturgis wrote:
> > Whenever I merge conflicts in a file, comments such as ">>>>>mine" or others with various words and symbols are supported, and I cannot compile the file afterwards until I delete the inserted comments. Is it possible to disable the insertion of these comments when merging files?
> No, it's not possible to disable the insertion of these comments. They
> are created by the subversion libraries to indicate conflicts between
> the revisions that you have merged. It's good that the code doesn't
> compile when it still contains conflicting changes.
> You have to resolve them manually or use a three way merge tool.
> TortoiseSVN comes with an easy to use three way merge tool -
> TortoiseMerge - which is invoked automatically when you edit a
> conflicted file either from the merge dialog or via the explorerc
> context menu.
> Cheers
> - 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-13 22:09:26 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.