Displaying 1 to 2 from 2 results

nbdime - Tools for diffing and merging of Jupyter notebooks.

  •    Python

nbdime provides tools for diffing and merging of Jupyter Notebooks. See the installation docs for more installation details and development installation instructions.

git-merge-driver - Example of how to configure a custom git merge driver

  •    Shell

This repository explains how to configure a custom merge driver in Git, allowing a custom tool to be run whenever certain files are caught in a merge conflict. Run example.sh for a demonstration of the merge driver. It will create a merge conflict in the repository, causing the merge driver to start and resolve the conflict.