Technically Feasible

How to Deal with Merge Conflicts in Git

on css-tricks.com

How to Deal with Merge Conflicts in Git