Why cant Git merge file changes with a modified parent/master.
- by Andy
I have a file with one line in it.
I create a branch and add a second line to the same file. Save and commit to the branch.
I switch back to the master. And add a different, second line to the file. Save and commit to the master.
So there's now 3 unique lines in total.
If I now try and merge the branch back to the master, it suffers a merge…