The thing is that git is not supposed to be smart when it comes to merging. https://wincent.com/blog/a-look-back-bram-cohen-vs-linus-torvalds https://wincent.co

The thing is that git is not supposed to be smart when it comes to merging. https://wincent.com/blog/a-look-back-bram-cohen-vs-linus-torvalds https://wincent.com/blog/a-look-back-bram-cohen-vs-linus-tor... At the end of the article: This is a clearly ambiguous merge and it simply wouldn’t be right for your version control system to try "resolving" it for you. So the strategy is that if there is any doubt you have to manually fix conflicts. This is by design.