Why editing two different lines result in merge conflict in git?

Asked Sep 27 '20 at 01:31

Active Sep 27 '20 at 12:06

Viewed 240 times

I have a single text file, in initial commit

Line1
Line2

I created branch from master, and committed this changes

Line1-b1
Line2

Finally I checkout to master and created this commit,

Line1
Line2-b2

When I try to merge to master , I got the following merge conflict, why? since the two lines are different, I was not expecting merge conflict.

<<<<<<< HEAD
Line1
Line2-m
=======
Line1-b1
Line2
>>>>>>> b1

edited Sep 27 '20 at 01:32

asked Sep 27 '20 at 01:31

4

Does this answer your question? [Why does git produce a merge conflict when lines next to each other are changed?](https://stackoverflow.com/questions/29276880/why-does-git-produce-a-merge-conflict-when-lines-next-to-each-other-are-changed) – mkrieger1 Sep 27 '20 at 01:32
@mkrieger1 it does not answer my question. – The Scientific Method Sep 27 '20 at 01:36
1

Then maybe [this one](https://stackoverflow.com/questions/42693608/when-exactly-does-a-git-merge-conflict-arise)? – mkrieger1 Sep 27 '20 at 01:41
@mkrieger1 NO, I need answer. – The Scientific Method Sep 27 '20 at 01:51
1

The answers are attached to the duplicate questions. – matt Sep 27 '20 at 01:56

0 Answers0