https://github.com/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.
https://github.com/liaojinxing/conflictresolver

conflict-resolution merge-conflicts xcode xcode-source-editor-extension

Last synced: 26 days ago
JSON representation

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.

• Host: GitHub
• URL: https://github.com/liaojinxing/conflictresolver
• Owner: liaojinxing
• License: mit
• Created: 2018-03-10T09:08:38.000Z (about 8 years ago)
• Default Branch: master
• Last Pushed: 2018-03-10T10:21:47.000Z (about 8 years ago)
• Last Synced: 2024-04-16T22:23:28.748Z (almost 2 years ago)
• Topics: conflict-resolution, merge-conflicts, xcode, xcode-source-editor-extension
• Language: Swift
• Size: 28 MB
• Stars: 25
• Watchers: 4
• Forks: 1
• Open Issues: 0
• Metadata Files:
  • Readme: README.md
  • License: LICENSE.md

Awesome Lists containing this project

README

          
Conflict Resolver

==

## Description

- An Xcode Source Editor Extension that helps resolving merge conflicts.

- Available via `Editor -> Resolve Conflict`



## Features

- [x] There are three options, namely 'Accept theirs', 'Accept Yours', and 'Keep Both'. Only one click and it will make the change for you automatically.

- [x] Jump to next conflict.

- [x] Git diff3 style supported.

## How to install

- Download the latest binary from https://github.com/liaojinxing/ConflictResolver/tree/master/Releases

- Drag MergePlugin.app to your Applications folder

- Double click MergePlugin.app and exit.

- Go to System Preferences -> Extensions -> Xcode Source Editor and enable the extension

- The menu-item should now be available from Xcode's Editor menu.

## Licence

This project is released under the MIT license. See LICENSE.md.