GitPlanet

Cheap and reliable Node.js hosting starts at $3/month, and $1/month static HTML hosting

Created with love in Canada, visit hostnodejs.com today

Feel like to post an Ad? Learn Details
All Projects → liaojinxing → ConflictResolver

liaojinxing / ConflictResolver

Licence: MIT license
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.

Programming Languages

swift
15916 projects

Labels

merge-conflictsconflict-resolutionxcodexcode-source-editor-extension

Projects that are alternatives of or similar to ConflictResolver

git-resolve-conflict
💲 ➕ ➖ ✅ Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
Stars: ✭ 44 (+83.33%)
Mutual labels:  merge-conflicts, conflict-resolution
syncthing-resolve-conflicts
A small bash script that handles synchronization conflicts with Syncthing. Inspired by 'pacdiff' from Arch Linux.
Stars: ✭ 61 (+154.17%)
Mutual labels:  conflict-resolution
ConflictJS
Finding and Understanding Conflicts Between JavaScript Libraries
Stars: ✭ 39 (+62.5%)
Mutual labels:  conflict-resolution
Git Imerge
Incremental merge for git
Stars: ✭ 2,322 (+9575%)
Mutual labels:  merge-conflicts
Xunique
merge Xcode project file is so easy
Stars: ✭ 1,450 (+5941.67%)
Mutual labels:  merge-conflicts
revctrl.org
An extract, as complete as I can make it, of content from the revctrl.org wiki
Stars: ✭ 13 (-45.83%)
Mutual labels:  merge-conflicts
magit-imerge
Magit extension for git-imerge
Stars: ✭ 26 (+8.33%)
Mutual labels:  merge-conflicts
Fac
Easy-to-use CUI for fixing git conflicts
Stars: ✭ 1,738 (+7141.67%)
Mutual labels:  conflict-resolution
jdime
syntactic merge tool for java
Stars: ✭ 14 (-41.67%)
Mutual labels:  conflict-resolution
SyncedStore
SyncedStore CRDT is an easy-to-use library for building live, collaborative applications that sync automatically.
Stars: ✭ 1,053 (+4287.5%)
Mutual labels:  conflict-resolution
ViewGenerator
⚒ ViewGenerator generates view code from variable name automatically in iOS development
Stars: ✭ 75 (+212.5%)
Mutual labels:  xcode-source-editor-extension

Conflict Resolver

Description

  • An Xcode Source Editor Extension that helps resolving merge conflicts.
  • Available via Editor -> Resolve Conflict

Features

  • There are three options, namely 'Accept theirs', 'Accept Yours', and 'Keep Both'. Only one click and it will make the change for you automatically.
  • Jump to next conflict.
  • 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.

Note that the project description data, including the texts, logos, images, and/or trademarks, for each open source project belongs to its rightful owner. If you wish to add or remove any projects, please contact us at [email protected].