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:
- Audio Recorder Helper Class written in Swift🎙☆13May 12, 2020Updated 5 years ago
- Demo app that shows how you can use D3.js with iOS in a UIWebView.☆10May 24, 2013Updated 12 years ago
- Swift 动态桥接库☆13Nov 28, 2019Updated 6 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 9 years ago
- ☆12Nov 16, 2019Updated 6 years ago
- NordVPN Threat Protection Pro™ • AdTake your cybersecurity to the next level. Block phishing, malware, trackers, and ads. Lightweight app that works with all browsers.
- GIFProgressHUD is a progress HUD with GIF for iOS.☆26Jul 26, 2016Updated 9 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
- Ink with Unity 2019 project featured in Youtube Tutorial☆14Jun 12, 2020Updated 5 years ago
- ☆11May 21, 2025Updated 10 months ago
- This is official video sessions of apple released by WWDC2019☆10Jun 7, 2019Updated 6 years ago
- DrawView☆14Dec 14, 2017Updated 8 years ago
- A project that uses Reinforcement Learning (Q-Learning) to trade stock.☆10Apr 23, 2017Updated 8 years ago
- Auto import header in Xcode 8☆11Aug 25, 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.
- iOS autolayout usage and demo.☆26Feb 24, 2014Updated 12 years ago
- ☆22Jan 17, 2026Updated 2 months ago
- Reactjs 개인적인 사용법 성능개선 방법 정리 (작성중..)☆13Aug 17, 2021Updated 4 years ago
- Fast TLB simulator for RISC-V systems☆16May 16, 2019Updated 6 years ago
- A UINavigationController category that allows the UINavigationBar to scroll with the content (iOS 8 only)☆28Sep 26, 2024Updated last year
- An iOS text field that autocompletes text with the supplied list of words.☆18Oct 19, 2020Updated 5 years ago
- HTTPServer Demo To Upload LogFile☆17Feb 27, 2019Updated 7 years ago
- Mobos Conference (Romania) about building modular apps with Xcode☆23Dec 15, 2023Updated 2 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
- 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 6 years ago
- bui-weex指引文档&开发手册☆14Aug 24, 2018Updated 7 years ago
- ManualLanguageSelectionSample☆18Nov 28, 2014Updated 11 years ago
- 一个简单的加入购物车动画☆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
- The source code for the Getting Started Guide on Vapor on swift.org☆21Jan 31, 2023Updated 3 years ago
- 多子控制器左右滑动切换，支持导航栏titleView跟随渐变。☆36Jun 2, 2017Updated 8 years ago
- 封装了友盟统计相关功能API，方便项目中调用☆10Nov 11, 2015Updated 10 years ago
- 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.
- Abandoned☆31Feb 14, 2014Updated 12 years ago
- Uneri (うねり) is a wave animation view library 🌊☆10Jul 30, 2019Updated 6 years ago
- 二维码扫描☆26Dec 16, 2015Updated 10 years ago
- ☆12Feb 27, 2015Updated 11 years ago
- Blur effect cover view in iOS 5 or later☆21Dec 16, 2013Updated 12 years ago
- old blog of hit9.org☆45Mar 21, 2015Updated 11 years ago
- Easy drop-in Alamofire request & response logger☆18Nov 27, 2020Updated 5 years ago