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
- A ruby-like mixin in Object-C.☆11Jul 2, 2015Updated 10 years ago
- Quickly add properties to categories using runtime associations.☆59Jun 7, 2019Updated 7 years ago
- Swift 动态桥接库☆13Nov 28, 2019Updated 6 years ago
- ☆11Sep 4, 2020Updated 5 years ago
- Bare Metal GPUs on DigitalOcean Gradient AI • AdPurpose-built for serious AI teams training foundational models, running large-scale inference, and pushing the boundaries of what's possible.
- 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 10 years ago
- ☆10Mar 2, 2017Updated 9 years ago
- ☆11May 21, 2025Updated last year
- This is official video sessions of apple released by WWDC2019☆10Jun 7, 2019Updated 7 years ago
- DrawView☆14Dec 14, 2017Updated 8 years ago
- 封装通讯录、短信功能☆15Feb 25, 2016Updated 10 years ago
- NSTask but with the ability to run privileged code☆11May 27, 2026Updated 2 weeks ago
- Auto import header in Xcode 8☆11Aug 25, 2020Updated 5 years ago
- iOS autolayout usage and demo.☆26Feb 24, 2014Updated 12 years ago
- Managed hosting for WordPress and PHP on Cloudways • AdManaged hosting for WordPress, Magento, Laravel, or PHP apps, on multiple cloud providers. Deploy in minutes on Cloudways by DigitalOcean.
- ☆24Jan 17, 2026Updated 4 months ago
- Package for easy handle mobi books in swift☆12Feb 5, 2026Updated 4 months ago
- HTTPServer Demo To Upload LogFile☆17Feb 27, 2019Updated 7 years ago
- 循环滚动的label控件☆13Aug 10, 2018Updated 7 years ago
- ☆16Apr 16, 2026Updated last month
- 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
- GPU virtual machines on DigitalOcean Gradient AI • AdGet to production fast with high-performance AMD and NVIDIA GPUs you can spin up in seconds. The definition of operational simplicity.
- 一个简单的加入购物车动画☆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
- 搜索页面的粒子动画☆16Sep 11, 2017Updated 8 years ago
- Easily frame your Watch UI in Swift Playgrounds.☆10May 8, 2020Updated 6 years ago
- XcodeKit extension for delivering variables and switches from enum cases☆13Sep 21, 2018Updated 7 years ago
- 多子控制器左右滑动切换，支持导航栏titleView跟随渐变。☆36Jun 2, 2017Updated 9 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
- Abandoned☆31Feb 14, 2014Updated 12 years ago
- AI Agents on DigitalOcean Gradient AI Platform • AdBuild production-ready AI agents using customizable tools or access multiple LLMs through a single endpoint. Create custom knowledge bases or connect external data.
- 仿拉勾首页交互效果，详细查看https://blog.csdn.net/iamzgx/article/details/81031914☆12Sep 9, 2018Updated 7 years ago
- iOS 控制台输出打印 显示☆16Feb 20, 2019Updated 7 years ago
- ☆12Feb 27, 2015Updated 11 years ago
- Tool for fast batch resigning of iOS applications on macOS☆27Feb 4, 2025Updated last year
- Blur effect cover view in iOS 5 or later☆21Dec 16, 2013Updated 12 years ago
- ☆17Oct 6, 2022Updated 3 years ago
- Custom TabBarController with a middle rounded button☆16Apr 28, 2019Updated 7 years ago