Why does git produce a merge conflict when lines next to each other are changed?

Question

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 c

Answer 1

You can specify a custom merge driver that will not conflict in this case in a .gitattributes file that's in the repo.