Git is an awesome tool for managing your code. However, it does take a while to get used to doing things in git. One question I get asked a bit too often is “how do I resolve binary merge conflicts”?…