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.

xcode

View on GitHub

25 Stars

1 Forks

25 Watchers

Swift Language

mit License

Cost to Build

$2.26M

Market Value

$2.33M

How is this calculated?

Growth over time

7 data points · 2021-08-01 → 2023-07-01

Stars Forks Watchers

💬

How do you feel about this project?

Ask AI about ConflictResolver

Question copied to clipboard

What is the liaojinxing/ConflictResolver GitHub project? Description: "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.". Written in Swift. Explain what it does, its main use cases, key features, and who would benefit from using it.

Question is copied to clipboard — paste it after the AI opens.

How to clone ConflictResolver

Clone via HTTPS

git clone https://github.com/liaojinxing/ConflictResolver.git

Clone via SSH

[email protected]:liaojinxing/ConflictResolver.git

Download ZIP

Download master.zip

Found an issue?

Report bugs or request features on the ConflictResolver issue tracker:

Open GitHub Issues

Similar to ConflictResolver

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