How to minimize git merge conflicts? How to minimize git merge conflicts? shell shell