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
Related projects ⓘ
Alternatives and complementary repositories for ConflictResolver
- Dynamic waterfall flowlayout☆120Updated 7 years ago
- Simple side navitation control for iOS in Swift , Right and Left sides, Support iPad & Object-C☆120Updated 3 years ago
- Provides an easy to use action sheet for debugging purpose when shaking your iOS device.☆97Updated 6 years ago
- 10000 Animations☆62Updated 7 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
- 🐣 Elegant UITableView generator for Swift.☆119Updated 4 years ago
- A set of progress views written in Swift☆51Updated 4 years ago
- Devices can detect the current device base system information. Support iOS, OSX, tvOS, watchOS.☆115Updated 3 years ago
- a video tool box help you edit video easily☆107Updated 6 years ago
- Redstone has a State Machine☆37Updated 5 years ago
- ☆65Updated 6 years ago
- ViewStyle provides a way to set UIView's visual appearance properties like CSS☆100Updated 7 years ago
- 便于构建 Header 悬停效果☆162Updated 6 years ago
- Lightweight reactive-api for MVVM☆32Updated 7 years ago
- Server side of Eblo backed by Vapor☆78Updated 7 years ago
- An easy-to-use picker view built on UIKitDynamics which can be used for content picking for iOS☆75Updated 6 years ago
- Easy to make smooth transitions with `UIPageViewController`, inspired by Apple's offical Music app.☆178Updated 7 years ago
- PIP Video Player for iOS☆109Updated last year
- Animation for insert, delete and move item.☆80Updated 8 years ago
- The utility for fast access to your iPhone Simulator apps.☆195Updated 4 years ago
- An Alamofire extension which converts JSON response data into swift objects using Codable☆49Updated 5 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 7 years ago
- The annotation implementation using Objective-C☆69Updated 5 years ago
- Tutorial Handler that helps you implement interactive on boarding and tutorials inside your iOS Apps.☆108Updated 6 years ago
- Class for monitor excessive blocking on the main thread and return stacktrace of all threads☆78Updated 6 years ago
- A iOS Client of gank.io written in Swift4.0 and Build with RxSwift + Moya + MVVM.☆80Updated 6 years ago
- An architecture for developing iOS apps which require the presentation of interchangeable lists of data☆92Updated 6 years ago
- swift closures utilities inspired by BlocksKit☆62Updated 8 years ago