liaojinxing / ConflictResolver
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 6 years ago
Alternatives and similar repositories for ConflictResolver:
Users that are interested in ConflictResolver are comparing it to the libraries listed below
- Dynamic waterfall flowlayout☆120Updated 7 years ago
- Provides an easy to use action sheet for debugging purpose when shaking your iOS device.☆97Updated 6 years ago
- PIP Video Player for iOS☆109Updated 2 years ago
- Devices can detect the current device base system information. Support iOS, OSX, tvOS, watchOS.☆113Updated 3 years ago
- ☆65Updated 7 years ago
- 便于构建 Header 悬停效果☆162Updated 7 years ago
- 10000 Animations☆62Updated 8 years ago
- Class for monitor excessive blocking on the main thread and return stacktrace of all threads☆77Updated 6 years ago
- 🐣 Elegant UITableView generator for Swift.☆119Updated 4 years ago
- Server side of Eblo backed by Vapor☆78Updated 7 years ago
- A set of progress views written in Swift☆51Updated 4 years ago
- The annotation implementation using Objective-C☆69Updated 6 years ago
- An easy-to-use picker view built on UIKitDynamics which can be used for content picking for iOS☆75Updated 6 years ago
- RichTextView based On TextKit☆69Updated 6 years ago
- An architecture for developing iOS apps which require the presentation of interchangeable lists of data☆92Updated 6 years ago
- Redstone has a State Machine☆37Updated 6 years ago
- XYDebugView is debug tool to draw the all view's frame in device screen and show it by 2d/3d style like reveal did.☆101Updated last year
- A Fancy Engineering Blogs Reader☆55Updated 7 years ago
- Lightweight reactive-api for MVVM☆32Updated 7 years ago
- ViewStyle provides a way to set UIView's visual appearance properties like CSS☆100Updated 7 years ago
- A Twitter Reader for iOSUpdated 4 years ago
- wwdc 2017 video subtitles☆40Updated 7 years ago
- 视频过渡效果演示☆72Updated 4 years ago
- Email address parser.☆70Updated 3 years ago
- Get autocompleted resources like images, localized strings and storyboards in ObjC projects☆110Updated 5 years ago
- A more fancy alert☆21Updated 4 years ago
- swift closures utilities inspired by BlocksKit☆62Updated 8 years ago
- A simple to use library that gets around a load of problems that arise when you start trying to do much inside 'loop'.☆1Updated 5 years ago
- Minimal segmented control, scrollable, customizable, animatable, easy as hell to use.☆32Updated 7 years ago
- Adapt very easily to 3D Touch.☆105Updated 7 years ago