liaojinxing / conflictresolver Goto Github PK
View Code? Open in Web Editor NEWAn 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.
License: MIT License