lockfile-conflicts

A custom merge driver, aims to handle lockfile conflicts automatically in merge/rebase process.

v0.3.0 URL: https://unpkg.com/lockfile-conflicts@0.3.0/index.js

Open Browse Files

git rebase merge lockfile pnpm npm yarn cli driver conflicts automerge monorepo cooperation workflow infra

semver-conflicts

Remove conflicts from a semver range

v1.0.3 URL: https://unpkg.com/semver-conflicts@1.0.3/index.js

Open Browse Files

semver conflicts range

conflicts

Detects when a new file is different than an existing file and prompts the user for action.

v1.1.2 URL: https://unpkg.com/conflicts@1.1.2/index.js

Open Browse Files

conflicts

gulp-conflicts

Detects when a (new) vinyl file is different than an existing file on the file system, and either prompts the user for action, skips the file, or calls a function on the file to determine the action to take.

v1.0.0 URL: https://unpkg.com/gulp-conflicts@1.0.0/index.js

Open Browse Files

conflict conflicts detect file gulp gulpplugin plugin stream

extra-git.sh

Common utility commands for Git repositories.

v2.0.0 URL: https://unpkg.com/extra-git.sh@2.0.0/index.sh

Open Browse Files

extra git add-submodule amend-push-submodules amend-push apush-submodules apush basename clone-init-submodules commit-push-submodules commit-push cpush-submodules cpush default-branch fullurl help init-submodules name url xclone add-username-remote age attic authors big-file branches-that-touch branch-name branch-rebaser change-author change-log changes checkout-by-date checkout-commit checkout-default-branch checkout-pr checkout-preview children-of churn commit-browser clone-subset comma conflicts copy-branch-name credit current-branch cut-branch delete-dangling-commits delete-local-merged delete-merged-branches delete-squashed-and-merged-branches delete-tag diff-last divergence edit-conflicts fetch-prs files find-dirty flush force-mtimes forest functionlog fzf-add fzf-log-browser fzf-pickaxe-browser fzf-reflog-browser github-open gitlab-mr history-graph ignored improved-merge incoming lines ls-branch-files ls-object-refs maildiff maxpack move-commits neck nuke object-deflate oldest-common-ancestor origin-head outgoing overwritten pie-ify plotrepo promote prune-branches pruneall publish purge-from-history pylint rank-contributors rebase-authors rebase-theirs recent recently-checkedout-branches ref-recent rel related remote-default-branch rename-branches reset-with-fire restore-mtime reup rm-deleted-from-repo root-directory run-command-on-revisions shamend show-overwritten shrink-repo sp sr stats submodule-rm switch-branch tag-and-sign tag-diff thanks track trail undelete undo-push undo unpushed unreleased up upstream-sync what-the-hell-just-happened when-merged where whoami winner wordiness wtf ahead-of-master fetch-pull-requests roots work-in-progress alias archive-file browse brv bulk changelog clear-soft clear coauthor commits-since contrib count cp create-branch delete-branch delete-squashed-branches delete-submodule delta effort feature force-clone fork fresh-branch gh-pages graft guilt ignore-io ignore info local-commits lock locked merge-into merge-repo missing mr obliterate paste pr psykorebase pull-request reauthor rebase-patch release rename-branch rename-remote rename-tag repl reset-file root scp sed setup show-merged-branches show-tree show-unmerged-branches squash stamp standup summary sync touch abort magic unlock utimes