Re: [QUESTION] Git fails to detect merge conflict?

2019-07-04 Thread Anton Ermolenko
LINE 5 LINE 6 LINE 7 LINE 8 LINE 9 --- END — Which is both changes applied sequentially - first, the change from “change-b” as it happens to be earlier in the file, then change from “change-a”. Thank you, Anton. > On 2 Jul 2019, at 10:15 am, Jonathan Nieder wrote: > &

[QUESTION] Git fails to detect merge conflict?

2019-07-01 Thread Anton Ermolenko
Hello folks, I'm writing on behalf of a customer and I wonder if you could help me to clarify if the following test case should be considered a bug or if it is expected behavior. # create repository git init # add initial content cat << EOF > example.txt --- START --- LINE 1 LINE 2