GitHub / 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.
JSON API: http://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/liaojinxing%2FConflictResolver
PURL: pkg:github/liaojinxing/ConflictResolver
Stars: 25
Forks: 1
Open issues: 0
License: mit
Language: Swift
Size: 28 MB
Dependencies parsed at: Pending
Created at: over 7 years ago
Updated at: over 1 year ago
Pushed at: over 7 years ago
Last synced at: over 1 year ago
Topics: conflict-resolution, merge-conflicts, xcode, xcode-source-editor-extension