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.

diffconflicts - A better Vimdiff Git mergetool

  •    Vim

tl;dr: This converts a file containing conflict markers into a two-way diff. When Git cannot automatically resolve conflicts it writes a file with conflict markers surrounding the conflicting areas. These conflicts must be resolved manually. This is often done via a three-way comparison.