liaojinxing / ConflictResolverLinks
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
Sorting:
- Devices can detect the current device base system information. Support iOS, OSX, tvOS, watchOS.☆113Updated 4 years ago
- Provides an easy to use action sheet for debugging purpose when shaking your iOS device.☆97Updated 7 years ago
- An easy-to-use picker view built on UIKitDynamics which can be used for content picking for iOS☆74Updated 6 years ago
- a video tool box help you edit video easily☆107Updated 7 years ago
- Dynamic waterfall flowlayout☆120Updated 7 years ago
- 🐣 Elegant UITableView generator for Swift.☆119Updated 4 years ago
- A Twitter Reader for iOS☆1Updated 4 years ago
- ☆65Updated 7 years ago
- 10000 Animations☆62Updated 8 years ago
- PIP Video Player for iOS☆109Updated 2 years ago
- ViewStyle provides a way to set UIView's visual appearance properties like CSS☆100Updated 8 years ago
- Leetcode solutions with Swift☆128Updated 7 years ago
- An architecture for developing iOS apps which require the presentation of interchangeable lists of data☆92Updated 6 years ago
- 便于构建 Header 悬停效果☆162Updated 7 years ago
- wwdc 2017 video subtitles☆40Updated 7 years ago
- ☆19Updated 6 years ago
- BMASpinningLabel is an UI component which provides easy way for displaying and animating text inside it☆150Updated 8 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.☆100Updated 2 years ago
- Let's play Pac-Man.☆102Updated 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 8 years ago
- The annotation implementation using Objective-C☆70Updated 6 years ago
- Auto Layout (and manual layout) in one line.☆74Updated 6 years ago
- Redstone has a State Machine☆37Updated 6 years ago
- Lightweight reactive-api for MVVM☆32Updated 8 years ago
- Simple side navitation control for iOS in Swift , Right and Left sides, Support iPad & Object-C☆120Updated 4 years ago
- Easy to make smooth transitions with `UIPageViewController`, inspired by Apple's offical Music app.☆180Updated 7 years ago
- CCGestureLock (Swift) is a customisable gesture/pattern lock for iOS written in Swift.☆101Updated 5 years ago
- RichTextView based On TextKit☆69Updated 6 years ago
- This project illustrates how to use AVFoundation to build a simple audio mixer.☆54Updated 8 years ago
- An Alamofire extension which converts JSON response data into swift objects using Codable☆49Updated 6 years ago