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
- Provides an easy to use action sheet for debugging purpose when shaking your iOS device.☆97Updated 6 years ago
- 便于构建 Header 悬停效果☆162Updated 7 years ago
- Devices can detect the current device base system information. Support iOS, OSX, tvOS, watchOS.☆113Updated 3 years ago
- Dynamic waterfall flowlayout☆120Updated 7 years ago
- ☆65Updated 7 years ago
- Redstone has a State Machine☆37Updated 6 years ago
- 10000 Animations☆62Updated 8 years ago
- An easy-to-use picker view built on UIKitDynamics which can be used for content picking for iOS☆75Updated 6 years ago
- A set of progress views written in Swift☆51Updated 4 years ago
- Class for monitor excessive blocking on the main thread and return stacktrace of all threads☆77Updated 6 years ago
- Lightweight reactive-api for MVVM☆32Updated 7 years ago
- ☆19Updated 6 years ago
- ViewStyle provides a way to set UIView's visual appearance properties like CSS☆100Updated 7 years ago
- An architecture for developing iOS apps which require the presentation of interchangeable lists of data☆92Updated 6 years ago
- 🐣 Elegant UITableView generator for Swift.☆119Updated 4 years ago
- The annotation implementation using Objective-C☆69Updated 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
- Simple side navitation control for iOS in Swift , Right and Left sides, Support iPad & Object-C☆120Updated 4 years ago
- Server side of Eblo backed by Vapor☆78Updated 7 years ago
- Objective-C Runtime Analysis (Objective-C运行时分析)☆30Updated 5 years ago
- 视频过渡效果演示☆72Updated 4 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
- a video tool box help you edit video easily☆107Updated 6 years ago
- An Alamofire extension which converts JSON response data into swift objects using Codable☆49Updated 5 years ago
- 💎A CocoaPods plugin which analyzes the dependencies of any cocoapods projects. Subspecs are properly handled.☆47Updated 2 years ago
- Panda is an asynchronous render and layout framework which can be used to achieve high performance tableview.☆196Updated 3 months ago
- A clean interface dropdown menu, appears underneath navigation bar to display a list of related items when you click on the navigation ti…☆69Updated 7 years ago
- Articles for NSHipster.cn☆119Updated 4 years ago
- The utility for fast access to your iPhone Simulator apps.☆194Updated 5 years ago
- 一款基于Swift 3.x的服务端框架,使用MVC设计你的服务端软件。☆43Updated 5 years ago