Xuniquemerge Xcode project file is so easy
git-resolve-conflict💲 ➕ ➖ ✅ Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
revctrl.orgAn extract, as complete as I can make it, of content from the revctrl.org wiki
ConflictResolverAn Xcode Source Editor Extension that helps resolving merge conflicts. There are three options, namely 'Accept theirs', 'Accept Yours', and 'Keep Both'. Only one click and it will make the change for you automatically.