liaojinxing / ConflictResolver

An 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.
25Updated 6 years ago

Related projects

Alternatives and complementary repositories for ConflictResolver