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
- ☆17Nov 16, 2025Updated 10 months ago
- ☆17Mar 19, 2018Updated 8 years ago
- ☆11Sep 4, 2020Updated 6 years ago
- Managed Kubernetes at scale on DigitalOcean • AdDigitalOcean Kubernetes includes the control plane, bandwidth allowance, container registry, automatic updates, and more for free.
- ☆10Mar 2, 2017Updated 9 years ago
- NSTask but with the ability to run privileged code☆11May 27, 2026Updated 3 months ago
- Package for easy handle mobi books in swift☆13Feb 5, 2026Updated 7 months ago
- Xcode中pbxproj预合并工具☆10Aug 12, 2017Updated 9 years ago
- 一个轻量级的接口mock工具☆12Jun 8, 2022Updated 4 years ago
- 循环滚动的label控件☆13Aug 10, 2018Updated 8 years ago
- An iOS text field that autocompletes text with the supplied list of words.☆18Oct 19, 2020Updated 5 years ago
- Checkers for iMessage☆12Dec 24, 2018Updated 7 years ago
- ☆13Jul 21, 2020Updated 6 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.
- 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
- 搜索页面的粒子动画☆16Sep 11, 2017Updated 9 years ago
- XcodeKit extension for delivering variables and switches from enum cases☆13Sep 21, 2018Updated 8 years ago
- Weex plugin for wechat(auth, pay, share).☆23Apr 12, 2018Updated 8 years ago
- Uneri (うねり) is a wave animation view library 🌊☆10Jul 30, 2019Updated 7 years ago
- 二维码扫描☆26Dec 16, 2015Updated 10 years ago
- Virtual machines for every use case on DigitalOcean • AdGet dependable uptime with 99.99% SLA, simple security tools, and predictable monthly pricing with DigitalOcean's virtual machines, called Droplets.
- 仿拉勾首页交互效果，详细查看https://blog.csdn.net/iamzgx/article/details/81031914☆12Sep 9, 2018Updated 8 years ago
- 压缩与解压缩Demo，zip/rar/7z对于移动端差不多够用了☆14Aug 20, 2018Updated 8 years ago
- iOS 控制台输出打印 显示☆16Feb 20, 2019Updated 7 years ago
- A Zsh shell client for https://pushover.net☆24May 4, 2015Updated 11 years ago
- Glorious, pixel perfect dicks on the command line☆14Sep 21, 2016Updated 10 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 3 months ago
- ☆22Mar 19, 2018Updated 8 years ago
- iOS file browser that lets you quickly explore the file system and mail interesting files to yourself☆14Oct 25, 2013Updated 12 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.
- Path动态绘制Drawable☆10Feb 6, 2017Updated 9 years ago
- New T7 Chicken☆13Dec 11, 2019Updated 6 years ago
- iOS 动态插件（实时模块更新）作者：NiePlus☆12Mar 22, 2016Updated 10 years ago
- An iOS passcode lock with TouchID authentication written in Swift.☆15Oct 3, 2017Updated 8 years ago
- The utility for fast access to your iPhone Simulator apps.☆190Dec 11, 2019Updated 6 years ago
- ☆19Mar 8, 2014Updated 12 years ago
- UITableView wrapper, that helps you define table contents by mapping view types to model instances.☆11Apr 20, 2020Updated 6 years ago