Resolving Git merge conflicts - easily and accurately
Nobody likes resolving merge/rebase/cherry-pick conflicts. I also don’t, but I’ve found a scheme how to reduce the built-in headache. In this post I’m going to share my findings as well as practical examples.