If you’ve ever had to deal with git merge conflicts, then there’s a good chance that these messages give you the chills: Auto-merging <SOURCE-FILE-PATH> CONFLICT (content): Merge conflict in <SOURCE-FILE-PATH> Automatic merge failed; fix conflicts and then commit the result.They arise when performing merges, reverts, and cherry-picks, and they scare people away and make them reconsider their actio
![How git-mediate made me stop fearing merge conflicts and start treating them like an easy game of…](https://cdn-ak-scissors.b.st-hatena.com/image/square/d089318942f89d1b4305c85428036fb4234542e1/height=288;version=1;width=512/https%3A%2F%2Fmiro.medium.com%2Fv2%2Fresize%3Afit%3A1200%2F1%2A32d1OLSLmcTrq1vLswEDDg.png)