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 7 years ago
Alternatives and similar repositories for ConflictResolver:
Users that are interested in ConflictResolver are comparing it to the libraries listed below
- Devices can detect the current device base system information. Support iOS, OSX, tvOS, watchOS.☆113Updated 3 years ago
- Lightweight reactive-api for MVVM☆32Updated 7 years ago
- PIP Video Player for iOS☆109Updated 2 years ago
- 🐣 Elegant UITableView generator for Swift.☆119Updated 4 years ago
- Provides an easy to use action sheet for debugging purpose when shaking your iOS device.☆97Updated 7 years ago
- Redstone has a State Machine☆37Updated 6 years ago
- The annotation implementation using Objective-C☆70Updated 6 years ago
- 10000 Animations☆62Updated 8 years ago
- 便于构建 Header 悬停效果☆162Updated 7 years ago
- Animation for insert, delete and move item.☆80Updated 8 years ago
- A Twitter Reader for iOSUpdated 4 years ago
- ☆65Updated 7 years ago
- Dynamic waterfall flowlayout☆120Updated 7 years ago
- wwdc 2017 video subtitles☆40Updated 7 years ago
- ViewStyle provides a way to set UIView's visual appearance properties like CSS☆100Updated 8 years ago
- The utility for fast access to your iPhone Simulator apps.☆194Updated 5 years ago
- A hybrid project for iOS, Vue and React.☆40Updated 6 years ago
- Easy to make smooth transitions with `UIPageViewController`, inspired by Apple's offical Music app.☆180Updated 7 years ago
- Swift 设计模式学习探索☆30Updated 8 years ago
- Let's play Pac-Man.☆102Updated 6 years ago
- A framework to transform data like JSON elegantly using the power of Swift programming language.☆42Updated 7 years ago
- An architecture for developing iOS apps which require the presentation of interchangeable lists of data☆92Updated 6 years ago
- Class for monitor excessive blocking on the main thread and return stacktrace of all threads☆77Updated 7 years ago
- 《Xcode Server and Continuous Integration Guide》官方文档中文版☆51Updated 4 years ago
- 💎A CocoaPods plugin which analyzes the dependencies of any cocoapods projects. Subspecs are properly handled.☆47Updated 2 years ago
- Simple side navitation control for iOS in Swift , Right and Left sides, Support iPad & Object-C☆120Updated 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
- swift closures utilities inspired by BlocksKit☆62Updated 8 years 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 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