-
Notifications
You must be signed in to change notification settings - Fork 1
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.
License
liaojinxing/ConflictResolver
ErrorLooks like something went wrong!
About
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.
Topics
Resources
License
Stars
Watchers
Forks
Releases
No releases published
Packages 0
No packages published