Re: Inexplicable merge conflict produced when when lines next to each other are changed

On Tue, Apr 28, 2015 at 07:34:30AM +, Anuradha Dissanayake wrote: > Let's say I have a file with this content in master: > > _ > Line 1 > Line 2 > Line 3 > Line 4 > _ > > Now say I create and checkout a new branch called Test. In this branch I > change the file to this: > > _

Inexplicable merge conflict produced when when lines next to each other are changed

I posted this question to StackOverflow a while ago but no one answered it so I thought I'd try here. Let's say I have a file with this content in master: _ Line 1 Line 2 Line 3 Line 4 _ Now say I create and checkout a new branch called Test. In this branch I change the file to this: