Tag: "git-merge-conflict-resolution".

Large Git merges can become complicated especially if there are a lots of unrelated changes to deal with. There is a little trick using `git checkout`, however, that may be useful to resolve merge conflicts quickly.