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.
☆25Mar 10, 2018Updated 8 years ago
Alternatives and similar repositories for ConflictResolver
Users that are interested in ConflictResolver are comparing it to the libraries listed below
Sorting:
- A ruby-like mixin in Object-C.☆11Jul 2, 2015Updated 10 years ago
- Swift 动态桥接库☆13Nov 28, 2019Updated 6 years ago
- ☆11Aug 18, 2019Updated 6 years ago
- URL Router for any object in iOS. Almost other routers are limited to controller or block, while LJURLRouter can route any object.☆14May 3, 2016Updated 9 years ago
- GIFProgressHUD is a progress HUD with GIF for iOS.☆26Jul 26, 2016Updated 9 years ago
- ☆10Mar 2, 2017Updated 9 years ago
- ☆11May 21, 2025Updated 10 months ago
- iOS 관련 이론 정리(Article) 및 기타 swfit 문법 학습을 위한 레퍼지토리입니다.☆13Nov 26, 2019Updated 6 years ago
- Auto import header in Xcode 8☆11Aug 25, 2020Updated 5 years ago
- NSTask but with the ability to run privileged code☆11Apr 16, 2019Updated 6 years ago
- Reactjs 개인적인 사용법 성능개선 방법 정리 (작성중..)☆13Aug 17, 2021Updated 4 years ago
- Package for easy handle mobi books in swift☆12Feb 5, 2026Updated last month
- A UINavigationController category that allows the UINavigationBar to scroll with the content (iOS 8 only)☆28Sep 26, 2024Updated last year
- HTTPServer Demo To Upload LogFile☆17Feb 27, 2019Updated 7 years ago
- this sample app show we can run Espresso unit test to single activity or Fragment when using Dagger 2 Android injector☆22Aug 30, 2019Updated 6 years ago
- Automatically generate Support & Resistance Lines on charts☆20May 22, 2016Updated 9 years ago
- Add Flutter to Existing app - iOS app☆14Jul 16, 2019Updated 6 years ago
- Playstation 1 SDK, used for emulation reverse engineer☆13Mar 9, 2015Updated 11 years ago
- ManualLanguageSelectionSample☆18Nov 28, 2014Updated 11 years ago
- a branch of tools for who heavily use development pods☆31Nov 21, 2018Updated 7 years ago
- A (potentially) great code editor for iOS, targeting the iPad. Likely written in Swift.☆74Jan 4, 2018Updated 8 years ago
- 搜索页面的粒子动画☆16Sep 11, 2017Updated 8 years ago
- Easily frame your Watch UI in Swift Playgrounds.☆10May 8, 2020Updated 5 years ago
- The source code for the Getting Started Guide on Vapor on swift.org☆21Jan 31, 2023Updated 3 years ago
- XcodeKit extension for delivering variables and switches from enum cases☆14Sep 21, 2018Updated 7 years ago
- 压缩与解压缩Demo，zip/rar/7z对于移动端差不多够用了☆14Aug 20, 2018Updated 7 years ago
- 封装了友盟统计相关功能API，方便项目中调用☆10Nov 11, 2015Updated 10 years ago
- Uneri (うねり) is a wave animation view library 🌊☆10Jul 30, 2019Updated 6 years ago
- ☆12Feb 27, 2015Updated 11 years ago
- Tool for fast batch resigning of iOS applications on macOS☆26Feb 4, 2025Updated last year
- Blur effect cover view in iOS 5 or later☆21Dec 16, 2013Updated 12 years ago
- Glorious, pixel perfect dicks on the command line☆14Sep 21, 2016Updated 9 years ago
- Wechat payment like password input view☆18Nov 2, 2015Updated 10 years ago
- A Swift port of https://github.com/lostincode/kickstarter-pulldown-bouncy☆14Dec 18, 2014Updated 11 years ago
- ☆15Jan 19, 2018Updated 8 years ago
- Simple comic viewer for iOS with CBZ, CBR and PDF support.☆19Jan 7, 2026Updated 2 months ago
- A full-featured, native Komga client for iOS, macOS, and tvOS☆51Updated this week
- ☆22Mar 19, 2018Updated 8 years ago
- Cloudflare workers friendly client for connecting to Apple's Push Notification Service using the new HTTP/2 protocol with JSON web tokens☆23Jan 4, 2025Updated last year