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:
- ☆18Apr 3, 2018Updated 8 years ago
- A ruby-like mixin in Object-C.☆11Jul 2, 2015Updated 11 years ago
- Quickly add properties to categories using runtime associations.☆59Jun 7, 2019Updated 7 years ago
- ☆11Sep 4, 2020Updated 5 years ago
- ☆10Mar 2, 2017Updated 9 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.
- ☆11May 21, 2025Updated last year
- DrawView☆14Dec 14, 2017Updated 8 years ago
- 封装通讯录、短信功能☆15Feb 25, 2016Updated 10 years ago
- ☆10Sep 4, 2022Updated 3 years ago
- NSTask but with the ability to run privileged code☆11May 27, 2026Updated last month
- Package for easy handle mobi books in swift☆12Feb 5, 2026Updated 4 months ago
- Adopting Picture in Picture (PiP) 📸 in a Custom Player ▶️ - Swift Language ☆39Jun 2, 2026Updated last month
- Networking framework in Swift☆10Sep 26, 2024Updated last year
- 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
- 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.
- 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
- Checkers for iMessage☆12Dec 24, 2018Updated 7 years ago
- ☆16Apr 16, 2026Updated 2 months ago
- 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 branch of tools for who heavily use development pods☆31Nov 21, 2018Updated 7 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.
- 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☆22Jan 31, 2023Updated 3 years ago
- 压缩与解压缩Demo，zip/rar/7z对于移动端差不多够用了☆14Aug 20, 2018Updated 7 years ago
- 封装了友盟统计相关功能API，方便项目中调用☆10Nov 11, 2015Updated 10 years ago
- Abandoned☆31Feb 14, 2014Updated 12 years ago
- Codelab for building a WebRTC Video chat application using Firebase Cloudstore.☆14Mar 6, 2023Updated 3 years ago
- Blur effect cover view in iOS 5 or later☆21Dec 16, 2013Updated 12 years ago
- ☆17Oct 6, 2022Updated 3 years ago
- 1-Click AI Models by DigitalOcean Gradient • AdDeploy popular AI models on DigitalOcean Gradient GPU virtual machines with just a single click. Zero configuration with optimized deployments.
- Custom TabBarController with a middle rounded button☆16Apr 28, 2019Updated 7 years ago
- A Swift port of https://github.com/lostincode/kickstarter-pulldown-bouncy☆14Dec 18, 2014Updated 11 years ago
- Wechat payment like password input view☆18Nov 2, 2015Updated 10 years ago
- 基于AVPlayer，实现滑动音量、进度，自动隐藏控制台等功能☆15Sep 18, 2016Updated 9 years ago
- ☆15Jan 19, 2018Updated 8 years ago
- ☆22Mar 19, 2018Updated 8 years ago
- a dynamic layout View Controller which inspired by StoreHouse☆12Jul 13, 2015Updated 10 years ago