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.
How to download and setup ConflictResolver
Open terminal and run command
git clone https://github.com/liaojinxing/ConflictResolver.git
git clone is used to create a copy or clone of ConflictResolver repositories.
You pass git clone a repository URL. it supports a few different network protocols and corresponding URL formats.
Also you may download zip file with ConflictResolver https://github.com/liaojinxing/ConflictResolver/archive/master.zip
Or simply clone ConflictResolver with SSH
[email protected]:liaojinxing/ConflictResolver.git
If you have some problems with ConflictResolver
You may open issue on ConflictResolver support forum (system) here: https://github.com/liaojinxing/ConflictResolver/issuesSimilar to ConflictResolver repositories
Here you may see ConflictResolver alternatives and analogs
teaching-app-dev-swift Hero TimLiu-iOS awesome-cheatsheets Alamofire SnapKit Kingfisher IQKeyboardManager ios-good-practices macdown OpenRCT2 ClangFormat-Xcode awesome-xcode-extensions dyci-main SCXcodeMiniMap KSHObjcUML Swimat Import Peckham SCXcodeSwitchExpander SwiftAI xcode-wakatime DXXcodeConsoleUnicodePlugin ShowInGitHub AMAppExportToIPA-Xcode-Plugin XcodeEquatableGenerator luft XcodePluginTool AMMethod2Implement tulsi