Thank you for this reaction.
I can follow what you write and it is clear to me that by doing what you
did, the situation I described can emerge. But the thing is: there were no
deletes. Head does not contain certain lines that the branch to merge in
does. So the lines in the branch to merge are
On Tuesday, 24 July 2012 09:36:41 UTC+1, Hans Zorn wrote:
>
> After doing a merge of 2 branches in a Delphi project I get some merge
> conflicts.
> Some I understand are clearly conflicts as they are simply adverse. But
> many look like this example:
>
> <<< HEAD
> ===
> + Butto