#

merge-driver

Here are 5 public repositories matching this topic...

jupyter / nbdime

Tools for diffing and merging of Jupyter notebooks.

git diff jupyter version-control jupyter-notebook mercurial merge vcs diffing hg mergetool merge-driver jupyterlab-extension

Updated May 4, 2024
TypeScript

Praqma / git-merge-driver

Example of how to configure a custom git merge driver

git example git-scm merge-driver

Updated Feb 5, 2024
Shell

emosheeep / lockfile-conflicts

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

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

Updated Jan 30, 2024
TypeScript

merge-drivers-cli

charpeni / merge-drivers-cli

A command-line interface to conveniently manage custom git merge drivers.

git merge-driver merge-drivers

Updated Nov 13, 2023
JavaScript

jelmer / awesome-merge-drivers

List of great merge drivers for git and other version control tools

git-merge merge-driver git-merge-drivers merge-drivers custom-merge

Updated Jan 16, 2023

Improve this page

Add a description, image, and links to the merge-driver topic page so that developers can more easily learn about it.

Curate this topic

Add this topic to your repo

To associate your repository with the merge-driver topic, visit your repo's landing page and select "manage topics."