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:
- A ruby-like mixin in Object-C.☆11Jul 2, 2015Updated 11 years ago
- Swift 动态桥接库☆13Nov 28, 2019Updated 6 years ago
- ☆11Sep 4, 2020Updated 5 years ago
- ☆10Mar 2, 2017Updated 9 years ago
- 封装通讯录、短信功能☆15Feb 25, 2016Updated 10 years ago
- Wordpress hosting with auto-scaling - Free Trial Offer • AdFully Managed hosting for WordPress and WooCommerce businesses that need reliable, auto-scalable performance. Cloudways SafeUpdates now available.
- 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
- Mobos Conference (Romania) about building modular apps with Xcode☆23Dec 15, 2023Updated 2 years ago
- NSTask but with the ability to run privileged code☆11May 27, 2026Updated 3 months ago
- A UINavigationController category that allows the UINavigationBar to scroll with the content (iOS 8 only)☆28Sep 26, 2024Updated last year
- Downloadable educational content of yfede.it website☆10Mar 7, 2018Updated 8 years ago
- Package for easy handle mobi books in swift☆13Feb 5, 2026Updated 6 months ago
- HTTPServer Demo To Upload LogFile☆17Feb 27, 2019Updated 7 years ago
- Auto import header in Xcode 8☆11Aug 25, 2020Updated 6 years ago
- An iOS text field that autocompletes text with the supplied list of words.☆18Oct 19, 2020Updated 5 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.
- bui-weex指引文档&开发手册☆14Aug 24, 2018Updated 8 years ago
- Playstation 1 SDK, used for emulation reverse engineer☆13Mar 9, 2015Updated 11 years ago
- a branch of tools for who heavily use development pods☆31Nov 21, 2018Updated 7 years ago
- 一个简单的加入购物车动画☆24Nov 26, 2015Updated 10 years ago
- ☆74Feb 15, 2018Updated 8 years ago
- A random-access, stacked-card iOS view☆11Jun 18, 2015Updated 11 years ago
- 多子控制器左右滑动切换，支持导航栏titleView跟随渐变。☆36Jun 2, 2017Updated 9 years ago
- ☆12Feb 27, 2015Updated 11 years ago
- 二维码扫描☆26Dec 16, 2015Updated 10 years ago
- Deploy on Railway without the complexity - Free Credits Offer • AdConnect your repo and Railway handles the rest with instant previews. Quickly provision container image services, databases, and storage volumes.
- 仿拉勾首页交互效果，详细查看https://blog.csdn.net/iamzgx/article/details/81031914☆12Sep 9, 2018Updated 7 years ago
- 压缩与解压缩Demo，zip/rar/7z对于移动端差不多够用了☆14Aug 20, 2018Updated 8 years ago
- iOS 控制台输出打印 显示☆16Feb 20, 2019Updated 7 years ago
- A Swift port of https://github.com/lostincode/kickstarter-pulldown-bouncy☆14Dec 18, 2014Updated 11 years ago
- Glorious, pixel perfect dicks on the command line☆14Sep 21, 2016Updated 9 years ago
- ☆15Jan 19, 2018Updated 8 years ago
- ☆17Oct 6, 2022Updated 3 years ago
- Wechat payment like password input view☆18Nov 2, 2015Updated 10 years ago
- Simple comic viewer for iOS with CBZ, CBR and PDF support.☆19Jun 15, 2026Updated 2 months ago
- Deploy on Railway without the complexity - Free Credits Offer • AdConnect your repo and Railway handles the rest with instant previews. Quickly provision container image services, databases, and storage volumes.
- 🔮 Magical import declarations formatter for Xcode☆107May 20, 2026Updated 3 months ago
- ☆22Mar 19, 2018Updated 8 years ago
- 基于AVPlayer，实现滑动音量、进度，自动隐藏控制台等功能☆15Sep 18, 2016Updated 9 years ago
- EmbedPDF Runtime — the PDF engine powering EmbedPDF. A fork of PDFium with EPDF_* extensions. Not affiliated with or endorsed by Google.☆17Updated this week
- app demo maker☆22Mar 7, 2014Updated 12 years ago
- What is an API? / Co je API?☆12Apr 14, 2022Updated 4 years ago
- Path动态绘制Drawable☆10Feb 6, 2017Updated 9 years ago