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. We may earn a commission when you buy through links labeled 'Ad' on this page.
Sorting:
- ☆18Apr 3, 2018Updated 8 years ago
- Audio Recorder Helper Class written in Swift🎙☆13May 12, 2020Updated 5 years ago
- A ruby-like mixin in Object-C.☆11Jul 2, 2015Updated 10 years ago
- Swift 动态桥接库☆13Nov 28, 2019Updated 6 years ago
- ☆17Mar 19, 2018Updated 8 years ago
- Proton VPN Special Offer - Get 70% off • AdSpecial partner offer. Trusted by over 100 million users worldwide. Tested, Approved and Recommended by Experts.
- ☆11Sep 4, 2020Updated 5 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
- LinkedME是国内首家企业级深度链接服务平台，致力于帮助App提高用户增长和流量变现。LinkedME采用Deep Linking，Deferred Deep Linking，Contextual Deep Linking， Machine Learning等技术，为移…☆36Mar 12, 2021Updated 5 years ago
- ☆10Sep 4, 2022Updated 3 years ago
- iOS 관련 이론 정리(Article) 및 기타 swfit 문법 학습을 위한 레퍼지토리입니다.☆13Nov 26, 2019Updated 6 years ago
- Auto import header in Xcode 8☆11Aug 25, 2020Updated 5 years ago
- iOS autolayout usage and demo.☆26Feb 24, 2014Updated 12 years ago
- End-to-end encrypted email - Proton Mail • AdSpecial offer: 40% Off Yearly / 80% Off First Month. All Proton services are open source and independently audited for security.
- Spring Boot todo list with Auditing☆13Oct 21, 2021Updated 4 years ago
- Package for easy handle mobi books in swift☆12Feb 5, 2026Updated 2 months ago
- Adopting Picture in Picture (PiP) 📸 in a Custom Player ▶️ - Swift Language ☆40Jan 16, 2023Updated 3 years ago
- Networking framework in Swift☆10Sep 26, 2024Updated last year
- Sample project to reproduce Xcode 13 & 14 indexing problems☆15Nov 3, 2022Updated 3 years ago
- An iOS text field that autocompletes text with the supplied list of words.☆18Oct 19, 2020Updated 5 years ago
- HTTPServer Demo To Upload LogFile☆17Feb 27, 2019Updated 7 years ago
- Template to generate VIPER classes on Xcode.☆13Aug 2, 2022Updated 3 years ago
- 循环滚动的label控件☆13Aug 10, 2018Updated 7 years ago
- Deploy to Railway using AI coding agents - Free Credits Offer • AdUse Claude Code, Codex, OpenCode, and more. Autonomous software development now has the infrastructure to match with Railway.
- Checkers for iMessage☆12Dec 24, 2018Updated 7 years ago
- ☆16Apr 16, 2026Updated 2 weeks 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
- ☆74Feb 15, 2018Updated 8 years ago
- A fully featured note taking app for Windows/Android/Linux with WebDAV sync☆25Updated this week
- a branch of tools for who heavily use development pods☆31Nov 21, 2018Updated 7 years ago
- 一个简单的加入购物车动画☆24Nov 26, 2015Updated 10 years ago
- A (potentially) great code editor for iOS, targeting the iPad. Likely written in Swift.☆75Jan 4, 2018Updated 8 years ago
- Deploy to Railway using AI coding agents - Free Credits Offer • AdUse Claude Code, Codex, OpenCode, and more. Autonomous software development now has the infrastructure to match with Railway.
- 搜索页面的粒子动画☆16Sep 11, 2017Updated 8 years ago
- The source code for the Getting Started Guide on Vapor on swift.org☆21Jan 31, 2023Updated 3 years ago
- 多子控制器左右滑动切换，支持导航栏titleView跟随渐变。☆36Jun 2, 2017Updated 8 years ago
- auto packaging for iOS☆17Apr 25, 2022Updated 4 years ago
- A random-access, stacked-card iOS view☆11Jun 18, 2015Updated 10 years ago
- 压缩与解压缩Demo，zip/rar/7z对于移动端差不多够用了☆14Aug 20, 2018Updated 7 years ago
- 封装了友盟统计相关功能API，方便项目中调用☆10Nov 11, 2015Updated 10 years ago