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
- Devices can detect the current device base system information. Support iOS, OSX, tvOS, watchOS.☆115Updated 3 years ago
- Provides an easy to use action sheet for debugging purpose when shaking your iOS device.☆97Updated 6 years ago
- Server side of Eblo backed by Vapor☆78Updated 7 years ago
- Class for monitor excessive blocking on the main thread and return stacktrace of all threads☆78Updated 6 years ago
- ViewStyle provides a way to set UIView's visual appearance properties like CSS☆100Updated 7 years ago
- 10000 Animations☆62Updated 7 years ago
- ☆19Updated 6 years ago
- A set of progress views written in Swift☆51Updated 4 years ago
- Lightweight reactive-api for MVVM☆32Updated 7 years ago
- The annotation implementation using Objective-C☆69Updated 5 years ago
- PIP Video Player for iOS☆109Updated last year
- wwdc 2017 video subtitles☆40Updated 7 years ago
- Animation for insert, delete and move item.☆80Updated 8 years ago
- 💎A CocoaPods plugin which analyzes the dependencies of any cocoapods projects. Subspecs are properly handled.☆47Updated last year
- Dynamic waterfall flowlayout☆120Updated 7 years ago
- A Twitter Reader for iOS☆0Updated 4 years ago
- An easy-to-use picker view built on UIKitDynamics which can be used for content picking for iOS☆75Updated 6 years ago
- 便于构建 Header 悬停效果☆162Updated 6 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
- Redstone has a State Machine☆37Updated 5 years ago
- swift closures utilities inspired by BlocksKit☆62Updated 8 years ago
- 🐣 Elegant UITableView generator for Swift.☆119Updated 4 years ago
- Simple side navitation control for iOS in Swift , Right and Left sides, Support iPad & Object-C☆120Updated 3 years ago
- A Fancy Engineering Blogs Reader☆55Updated 7 years ago
- 视频过渡效果演示☆72Updated 4 years ago
- 【Deprecated】Extension for the UITableView that allows a user to move cells with long press and drop.☆26Updated 7 years ago
- This project illustrates how to use AVFoundation to build a simple audio mixer.☆54Updated 7 years ago