Get the latest tech news
Resistance Against Git Merge Hell
It's so easy to end up with git commit history which looks like London tube map. Let's see how we end up with those big, ugly, meaningless commit histories and how to prevent having one.
Git merge manual explains what actually happened here really well and I copied the description by changing only the references: General rule of thumb here is that you should work on your own fork and shouldn’t push a feature branch into the shared remote upstream repository. If you are on a long term big project where more than one person is involved, using merging like this in an obnoxious way and it will make you and your team suffer.
Or read this on Hacker News