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:
- Swift 动态桥接库☆13Nov 28, 2019Updated 6 years ago
- ☆17Mar 19, 2018Updated 8 years ago
- ☆11Sep 4, 2020Updated 6 years ago
- ☆10Mar 2, 2017Updated 9 years ago
- ☆12Nov 16, 2019Updated 6 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.
- LinkedME是国内首家企业级深度链接服务平台，致力于帮助App提高用户增长和流量变现。LinkedME采用Deep Linking，Deferred Deep Linking，Contextual Deep Linking， Machine Learning等技术，为移…☆36Mar 12, 2021Updated 5 years ago
- ☆11May 21, 2025Updated last year
- DrawView☆14Dec 14, 2017Updated 8 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
- A UINavigationController category that allows the UINavigationBar to scroll with the content (iOS 8 only)☆28Sep 26, 2024Updated 2 years ago
- Sample project to reproduce Xcode 13 & 14 indexing problems☆15Nov 3, 2022Updated 3 years ago
- Downloadable educational content of yfede.it website☆10Mar 7, 2018Updated 8 years ago
- Xcode中pbxproj预合并工具☆10Aug 12, 2017Updated 9 years ago
- HTTPServer Demo To Upload LogFile☆17Feb 27, 2019Updated 7 years ago
- GPUs on demand by Runpod - Special Offer Available • AdRun AI, ML, and HPC workloads on powerful cloud GPUs—without limits or wasted spend. Deploy GPUs in under a minute and pay by the second.
- Auto import header in Xcode 8☆11Aug 25, 2020Updated 6 years ago
- 一个轻量级的接口mock工具☆12Jun 8, 2022Updated 4 years ago
- iOS autolayout usage and demo.☆25Feb 24, 2014Updated 12 years ago
- Checkers for iMessage☆12Dec 24, 2018Updated 7 years ago
- 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 7 years ago
- Automatically generate Support & Resistance Lines on charts☆20May 22, 2016Updated 10 years ago
- ☆13Jul 21, 2020Updated 6 years ago
- bui-weex指引文档&开发手册☆15Aug 24, 2018Updated 8 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.
- 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
- Easily frame your Watch UI in Swift Playgrounds.☆10May 8, 2020Updated 6 years ago
- ☆73Feb 15, 2018Updated 8 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
- 多子控制器左右滑动切换，支持导航栏titleView跟随渐变。☆36Jun 2, 2017Updated 9 years ago
- End-to-end encrypted cloud storage - Proton Drive • AdSpecial offer: 40% Off Yearly / 80% Off First Month. Protect your most important files, photos, and documents from prying eyes.
- 封装了友盟统计相关功能API，方便项目中调用☆10Nov 11, 2015Updated 10 years ago
- Uneri (うねり) is a wave animation view library 🌊☆10Jul 30, 2019Updated 7 years ago
- old blog of hit9.org☆45Mar 21, 2015Updated 11 years ago
- A Zsh shell client for https://pushover.net☆24May 4, 2015Updated 11 years ago
- A Swift port of https://github.com/lostincode/kickstarter-pulldown-bouncy☆14Dec 18, 2014Updated 11 years ago
- Todo application for iOS using Deli.☆30Nov 8, 2018Updated 7 years ago
- iOS Live2D SDK☆23Mar 22, 2017Updated 9 years ago