18 packages matching “mergetool”
@chojs23/ec
v0.3.3 · 1 month ago
Terminal Git mergetool with a 3-way TUI and Neovim integration
No known vulnerabilities
multi-image-mergetool
v1.32.1 · 9 years ago
Resolve multiple image conflicts at the same time
No known vulnerabilities
@rnx-kit/fork-sync
v0.5.0 · 1 month ago
EXPERIMENTAL - USE WITH CAUTION - Sync forked/vendored dependencies with upstream using AI-powered Git 3-way merge
No known vulnerabilities
gitq-biu
v1.0.83 · 6 years ago
git biubiubiu
No known vulnerabilities
@targets/git
v0.2.4 · 6 years ago
Git ShellSpec target
No known vulnerabilities
sfdcm
v1.0.0 · 7 years ago
Merge salesforce metadata with ease
No known vulnerabilities
create-react-app-updater
v1.3.0 · 1 year ago
Update Create React App projects
No known vulnerabilities
git-merge-forge
v1.1.6 · 4 months ago
Modern browser-based Git merge conflict resolution tool with a multi-repo dashboard, three-pane Monaco editor, pre-merge conflict prediction, character-level diff, BASE pane, auto-resolve, and an AI assistant supporting Claude, OpenAI, Gemini, xAI, and Ol
No known vulnerabilities
thimble
v1.0.5 · 9 years ago
A scaffolding tool that grows with you
No known vulnerabilities
git-resolve-conflict
v2.0.0 · 6 years ago
Resolve git conflict in a given file, using given strategy (--ours, --theirs, --union)
No known vulnerabilities
@targets/npm
v0.0.3 · 6 years ago
NPM ShellSpec target
No known vulnerabilities
yeoman-merge-ui
v1.1.0 · 8 years ago
yeoman custom ui to resolve conflict.
No known vulnerabilities
load-git-config
v0.2.0 · 7 years ago
Loads the resolved git configuration.
No known vulnerabilities
@thomas-brekelmans/fds
v7.19.0-beta · 6 years ago
## Build files The source code in this repository (located in /src) needs to be compiled to ES2015 JavaScript (located in /lib).
No known vulnerabilities
git-diff-apply
v7.0.5 · 10 months ago
Use an unrelated remote repository to apply a git diff
No known vulnerabilities
creator-smart-merge
v1.0.8 · 7 years ago
Cocos Creator expand plugin help user to merge their .fire/.prefab files.
No known vulnerabilities
git-conflicts
v1.5.0 · 9 years ago
Manual merge tool
No known vulnerabilities
@phated/git-diff-apply
v0.22.10 · 5 years ago
(Fork) Use an unrelated remote repository to apply a git diff
No known vulnerabilities