Re: [TSVN] Merge conflict: include both files

José Vilaça wrote:

> When merging two files into a third one, I came to a point where I
> wanted to include lines from both sides. Two functions were placed in
> the middle of the file, and TortoiseMerge considered them a conflict and
> expected me to choose one of the blocks (or parts of it). This forced me
> to go into notepad to solve the conflict as the lines of one partially
> overlapped lines of the other.
>
> I was wondering how complex it is to allow the inclusion of both source
> files into the merged file to cover these cases where those changes are
> meaningful.

Already implemented: right-click on the lines in the _bottom_view, not
the left or the right view. There you'll have additional entries which
allow you to choose "theirs before yours" and "yours before theirs".

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org