Re: comments inserted on merge

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
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2436549
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].