1 post tagged with git

Resolving Conflicts in Git

Resolving Conflicts in Git

Resolving conflicts in git can be intimidating, and even more so if you plan on using a cli tool. In this post, I try and resolve (pun intended) some of those concerns.