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
- ☆17Mar 19, 2018Updated 8 years ago
- ☆11Sep 4, 2020Updated 5 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
- 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.
- ☆11May 21, 2025Updated last year
- 封装通讯录、短信功能☆15Feb 25, 2016Updated 10 years ago
- NSTask but with the ability to run privileged code☆11May 27, 2026Updated last month
- Reactjs 개인적인 사용법 성능개선 방법 정리 (작성중..)☆13Aug 17, 2021Updated 4 years ago
- Sample project to reproduce Xcode 13 & 14 indexing problems☆15Nov 3, 2022Updated 3 years ago
- A UINavigationController category that allows the UINavigationBar to scroll with the content (iOS 8 only)☆28Sep 26, 2024Updated last year
- Package for easy handle mobi books in swift☆12Feb 5, 2026Updated 5 months ago
- Adopting Picture in Picture (PiP) 📸 in a Custom Player ▶️ - Swift Language ☆40Jun 2, 2026Updated last month
- Xcode中pbxproj预合并工具☆10Aug 12, 2017Updated 8 years ago
- Simple, predictable pricing with DigitalOcean hosting • AdAlways know what you'll pay with monthly caps and flat pricing. Enterprise-grade infrastructure trusted by 600k+ customers.
- HTTPServer Demo To Upload LogFile☆17Feb 27, 2019Updated 7 years ago
- Auto import header in Xcode 8☆11Aug 25, 2020Updated 5 years ago
- Template to generate VIPER classes on Xcode.☆13Aug 2, 2022Updated 3 years ago
- 循环滚动的label控件☆13Aug 10, 2018Updated 7 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
- Add Flutter to Existing app - iOS app☆14Jul 16, 2019Updated 7 years ago
- ☆13Jul 21, 2020Updated 6 years ago
- bui-weex指引文档&开发手册☆14Aug 24, 2018Updated 7 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.
- a branch of tools for who heavily use development pods☆31Nov 21, 2018Updated 7 years ago
- The source code for the Getting Started Guide on Vapor on swift.org☆22Jan 31, 2023Updated 3 years ago
- 搜索页面的粒子动画☆16Sep 11, 2017Updated 8 years ago
- XcodeKit extension for delivering variables and switches from enum cases☆13Sep 21, 2018Updated 7 years ago
- auto packaging for iOS☆17Apr 25, 2022Updated 4 years ago
- A random-access, stacked-card iOS view☆11Jun 18, 2015Updated 11 years ago
- Easy drop-in Alamofire request & response logger☆18Nov 27, 2020Updated 5 years ago
- 多子控制器左右滑动切换，支持导航栏titleView跟随渐变。☆36Jun 2, 2017Updated 9 years ago
- 封装了友盟统计相关功能API，方便项目中调用☆10Nov 11, 2015Updated 10 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.
- A command line tool for backing up a Windows Azure SQL Database to Blob Storage, by making a copy of the database☆19Sep 10, 2013Updated 12 years ago
- Uneri (うねり) is a wave animation view library 🌊☆10Jul 30, 2019Updated 6 years ago
- ☆12Feb 27, 2015Updated 11 years ago
- 仿拉勾首页交互效果，详细查看https://blog.csdn.net/iamzgx/article/details/81031914☆12Sep 9, 2018Updated 7 years ago
- 压缩与解压缩Demo，zip/rar/7z对于移动端差不多够用了☆14Aug 20, 2018Updated 7 years ago
- iOS 控制台输出打印 显示☆16Feb 20, 2019Updated 7 years ago
- Custom TabBarController with a middle rounded button☆16Apr 28, 2019Updated 7 years ago