Re: Re: Merge problem SVN 1,8

On Fri, Jul 4, 2014 at 2:02 PM, Markus Humm <markus.humm_at_de.ebmpapst.com>
wrote:

> Hello,
>
> since we do not want to do a automatic merge, we do not need a 3-way
> diff/merge tool. For us it would be sufficient if there would be a mode
> where Tortoise would call WinMerge with the current version from
> WC/trunk/branch and the current version from the branch which shall be
> merged into that WC/trunk/branch.
>

Sorry, but whether you want to do automatic or manual merging doesn't
matter. You still need a three-way merge/diff tool to resolve possible
conflicts.
And you simply can not do that with a two-way diff tool like WinMerge.

have a look at this page here:
http://tortoisesvn.net/docs/release/TortoiseMerge_en/tmerge-basics-conflicts.html
and read it. It explains why you need a three-way merge/diff tool to
resolve merge conflicts.

>
> It was also mentioned, that my foo.c would contain conflict markers. When
> I select "resolve later" in the progress dialog and look at all 4 files
> (.c, .r1183, .r1188 and .working) none contains anhy conflict markers!
>

only the foo.c file would contain conflict markers. The other files never
get such markers added.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3084546
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].