Resolve git conflict in a given file, using given strategy (--ours, --theirs, --union)
github.com/jakub-g/git-resolve-conflict
jakub-g/git-resolve-conflict