Magit-imerge is a Magit interface to git-imerge, a Git extension for performing incremental merges. See git-imerge's homepage for more information about git-imerge. The commentary in magit-imerge.el provides an overview of Magit-imerge commands.
magit / magit-imerge
Licence: other
Magit extension for git-imerge
Stars: ✭ 26
Programming Languages
emacs lisp
2029 projects
Makefile
30231 projects
Projects that are alternatives of or similar to magit-imerge
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.
Stars: ✭ 24 (-7.69%)
Mutual labels: merge-conflicts
git-resolve-conflict
💲 ➕ ➖ ✅ Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
Stars: ✭ 44 (+69.23%)
Mutual labels: merge-conflicts
revctrl.org
An extract, as complete as I can make it, of content from the revctrl.org wiki
Stars: ✭ 13 (-50%)
Mutual labels: merge-conflicts
git-identity.el
Manage multiple Git identities from inside Emacs
Stars: ✭ 22 (-15.38%)
Mutual labels: magit
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].