git-resolve-conflict (npm): Resolve git conflict in a given file, using given strategy (--ours, --theirs, --union)
Keywords: git|conflict|merge|conflict-resolution|conflicting-changes|git-mergetools|merge-conflicts|resolve-conflicts