liaojinxing / ConflictResolverLinks
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.
☆25Updated 7 years ago
Alternatives and similar repositories for ConflictResolver
Users that are interested in ConflictResolver are comparing it to the libraries listed below
Sorting:
- Provides an easy to use action sheet for debugging purpose when shaking your iOS device.☆96Updated 7 years ago
- The utility for fast access to your iPhone Simulator apps.☆194Updated 6 years ago
- 10000 Animations☆62Updated 9 years ago
- Lightweight reactive-api for MVVM☆32Updated 8 years ago
- Simple navigation bar in the bottom, a beautiful discretion in your UI.☆226Updated 8 years ago
- Dynamic waterfall flowlayout☆120Updated 8 years ago
- 便于构建 Header 悬停效果☆161Updated 8 years ago
- Redstone has a State Machine☆37Updated 7 years ago
- An architecture for developing iOS apps which require the presentation of interchangeable lists of data☆92Updated 7 years ago
- Leetcode solutions with Swift☆129Updated 7 years ago
- ☆124Updated 9 years ago
- A Powerful , Extensible CSS Parser written in pure Swift.☆279Updated 6 years ago
- PIP Video Player for iOS☆108Updated 3 years ago
- wwdc 2017 video subtitles☆40Updated 8 years ago
- Some notes recording the dance of RxSwift and MVVM in iOS.☆81Updated 8 years ago
- An easy-to-use picker view built on UIKitDynamics which can be used for content picking for iOS☆73Updated 7 years ago
- a video tool box help you edit video easily☆106Updated 7 years ago
- Alamofire network library URLCache-based cache extension☆125Updated 4 years ago
- Articles for NSHipster.cn☆118Updated 5 years ago
- Easy to make smooth transitions with `UIPageViewController`, inspired by Apple's offical Music app.☆177Updated 8 years ago
- A hybrid project for iOS, Vue and React.☆39Updated 7 years ago
- 🐣 Elegant UITableView generator for Swift.☆119Updated 5 years ago
- MetaModel is designed to deal with model layer in iOS development with concise APIs which including data persistent, JSON to model and et…☆72Updated 2 years ago
- Get autocompleted resources like images, localized strings and storyboards in ObjC projects☆111Updated 6 years ago
- A library used to separate concerns from the original UIKit framework.☆29Updated 8 years ago
- Server side of Eblo backed by Vapor☆78Updated 8 years ago
- Devices can detect the current device base system information. Support iOS, OSX, tvOS, watchOS.☆114Updated 4 years ago
- Panda is an asynchronous render and layout framework which can be used to achieve high performance tableview.☆198Updated last year
- Amoyly Xcode Themes☆60Updated 3 weeks ago
- Let's play Pac-Man.☆103Updated 7 years ago