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
- ☆11Aug 18, 2019Updated 6 years ago
- ☆10Mar 2, 2017Updated 9 years ago
- This is official video sessions of apple released by WWDC2019☆10Jun 7, 2019Updated 7 years ago
- Managed Database hosting by DigitalOcean • AdPostgreSQL, MySQL, MongoDB, Kafka, Valkey, and OpenSearch available. Automatically scale up storage and focus on building your apps.
- ☆11May 21, 2025Updated last year
- The documents for hexo-theme-suka☆10Sep 19, 2023Updated 2 years ago
- A project that uses Reinforcement Learning (Q-Learning) to trade stock.☆10Apr 23, 2017Updated 9 years ago
- Spring Boot todo list with Auditing☆13Oct 21, 2021Updated 4 years ago
- An Xcode Source Editor Extension that generates a type declaration based on the file name☆12Dec 25, 2016Updated 9 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 10 years ago
- NSTask but with the ability to run privileged code☆11May 27, 2026Updated 2 months ago
- Config is a framework written in Swift that makes it easy for you to use JSON file as a configuration, with JSON keys in dot notation in …☆14Nov 30, 2021Updated 4 years ago
- A UINavigationController category that allows the UINavigationBar to scroll with the content (iOS 8 only)☆28Sep 26, 2024Updated last year
- 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.
- Sample project to reproduce Xcode 13 & 14 indexing problems☆15Nov 3, 2022Updated 3 years ago
- Xcode中pbxproj预合并工具☆10Aug 12, 2017Updated 9 years ago
- 个人练手项目☆17Jul 19, 2016Updated 10 years ago
- 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 4 years ago
- iOS autolayout usage and demo.☆26Feb 24, 2014Updated 12 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
- 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.
- Add Flutter to Existing app - iOS app☆14Jul 16, 2019Updated 7 years ago
- this sample app show we can run Espresso unit test to single activity or Fragment when using Dagger 2 Android injector☆22Aug 30, 2019Updated 6 years ago
- Automatically generate Support & Resistance Lines on charts☆20May 22, 2016Updated 10 years ago
- ☆13Jul 21, 2020Updated 6 years ago
- bui-weex指引文档&开发手册☆14Aug 24, 2018Updated 7 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
- ☆74Feb 15, 2018Updated 8 years ago
- 搜索页面的粒子动画☆16Sep 11, 2017Updated 8 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.
- XcodeKit extension for delivering variables and switches from enum cases☆13Sep 21, 2018Updated 7 years ago
- 多子控制器左右滑动切换，支持导航栏titleView跟随渐变。☆36Jun 2, 2017Updated 9 years ago
- ☆12Feb 27, 2015Updated 11 years ago
- 二维码扫描☆26Dec 16, 2015Updated 10 years ago
- 仿拉勾首页交互效果，详细查看https://blog.csdn.net/iamzgx/article/details/81031914☆12Sep 9, 2018Updated 7 years ago
- iOS 控制台输出打印 显示☆16Feb 20, 2019Updated 7 years ago
- Custom TabBarController with a middle rounded button☆16Apr 28, 2019Updated 7 years ago