git-diff-apply

Use an unrelated remote repository to apply a git diff

v7.0.2 URL: https://unpkg.com/git-diff-apply@7.0.2/src/index.js

Open Browse Files

patch tag merge commit cherry-pick mergetool update conflict

multi-image-mergetool

Resolve multiple image conflicts at the same time

v1.32.1 URL: https://unpkg.com/multi-image-mergetool@1.32.1/server/index.js

Open Browse Files

image merge mergetool diff visual testing

git-conflicts

Manual merge tool

v1.5.0 URL: https://unpkg.com/git-conflicts@1.5.0

Open Browse Files

git merge tool mergetool rebase marker conflict resolution editor

@phated/git-diff-apply

(Fork) Use an unrelated remote repository to apply a git diff

v0.22.10 URL: https://unpkg.com/@phated/git-diff-apply@0.22.10/src/index.js

Open Browse Files

patch tag merge commit cherry-pick mergetool update conflict