Git is rather timid with merge conflicts. If you change two adjacent lines, it assumes they conflict! https://softwareengineering.stackexchange.com/questions/194788/why-doesnt-git-merge-adjacent-lines-without-conflict
In my experience they don't, and it causes problems when library imports change at the top of the file. Interestingly, Subversion happily merges.
miniblog.
Related Posts
I'm experimenting with <<<<<<< merge conflict markers in difftastic: recreate the conflicting files and then diff them.
What do you think? Merge conflicts are confusing even at the best of times, but maybe difftastic's UI can help a little.
So many website APIs are effectively competing with the website, in addition to requiring dev time. Is this conflict of interest fixable?