Re: Resolving Conflicts

On 25.10.2013 13:14, Avinash Singh wrote:
> Hi,
>
> I have experienced an issue in the way conflicts are resolved.
>
> Basically I had a conflicted file which had no conflicts within the
> file. Everything looked to be merged correctly. So I right-clicked the
> “red” file from the “check for modifications” screen and selected the
> “Resolved” option.
>
> This however caused some merge information to be part of the file. For
> example:
>
> <<<<<<< .working
>
> >>>>>>> .merge-right.r13749
>
> I redid the merge and selected “Edit Conflict”. In the new window I
> selected “Mark as Resolved”, this merged the file correctly.
>
> Why do both these options have different behaviour?

My guess is that you have the diff viewer/conflict editor
(TortoiseMerge?) configured to ignore EOLs. But when you did the merge,
you forgot to specify to ignore EOLs/whitespace changes. So you got a
conflict due to different EOLs.
Then you opened the conflicted files in the editor which ignores EOLs
and then there's no conflict (the conflict is in EOLs, but EOLs are
ignored, so no conflict shown).

If you don't save the file now, the EOL conflict is kept. Just marking
the file as resolved won't change that.

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=3067106
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].