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:
- The utility for fast access to your iPhone Simulator apps.☆194Updated 5 years ago
- Dynamic waterfall flowlayout☆120Updated 7 years ago
- 便于构建 Header 悬停效果☆161Updated 7 years ago
- Provides an easy to use action sheet for debugging purpose when shaking your iOS device.☆96Updated 7 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☆74Updated 7 years ago
- PIP Video Player for iOS☆108Updated 2 years ago
- Simple navigation bar in the bottom, a beautiful discretion in your UI.☆227Updated 7 years ago
- 🐣 Elegant UITableView generator for Swift.☆119Updated 4 years ago
- Easy to make smooth transitions with `UIPageViewController`, inspired by Apple's offical Music app.☆178Updated 7 years ago
- Get autocompleted resources like images, localized strings and storyboards in ObjC projects☆111Updated 6 years ago
- DEPRECATED☆383Updated 6 years ago
- wwdc 2017 video subtitles☆40Updated 8 years ago
- Devices can detect the current device base system information. Support iOS, OSX, tvOS, watchOS.☆113Updated 4 years ago
- Simple side navitation control for iOS in Swift , Right and Left sides, Support iPad & Object-C☆120Updated 4 years ago
- make it easy to debug databases in iOS applications iOS debug database☆257Updated 3 years ago
- MetaModel is designed to deal with model layer in iOS development with concise APIs which including data persistent, JSON to model and et…☆72Updated 2 years ago
- Articles for NSHipster.cn☆119Updated 5 years ago
- ☆124Updated 8 years ago
- Leetcode solutions with Swift☆129Updated 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.☆100Updated 2 years ago
- Bamboots - Extension 4 Alamofire☆439Updated 4 years ago
- An architecture for developing iOS apps which require the presentation of interchangeable lists of data☆92Updated 6 years ago
- Amoyly Xcode Themes☆59Updated 8 years ago
- An AR shooting game for the WWDC 2018 Scholarship [Accepted]. ARKit 飞盘射击游戏，WWDC 2018 奖学金入选作品☆87Updated 7 years ago
- a video tool box help you edit video easily☆106Updated 7 years ago
- A Powerful , Extensible CSS Parser written in pure Swift.☆280Updated 6 years ago
- A hybrid project for iOS, Vue and React.☆39Updated 6 years ago
- Yet another stupid wrapper of icon font.☆200Updated 5 years ago
- fir.im client on macOS☆115Updated 8 years ago