mergetool

There are 1 repository under mergetool topic.

• jupyter / nbdime

  Tools for diffing and merging of Jupyter notebooks.

  jupyterlab-extensionjupyterjupyter-notebookdiffdiffingmergegithgmercurialmergetoolmerge-drivervcsversion-control
  Language:TypeScript 2600

• whiteinge / diffconflicts

  A better Vimdiff Git mergetool

  gitmergetoolvimvim-pluginvimdiff
  Language:Vim Script 380

• samoshkin / vim-mergetool

  :cake: Efficient way of using Vim as a Git mergetool

  diffgitmerge-conflictsmergetoolvimvim-pluginvimdiff
  Language:Vim script 282

• lenormf / kakmerge

  A Kakoune-based mergetool for Git

  kakounegitmergetoolscriptmerge3-way-merge
  Language:Shell 35

• paulotome / emacstool

  Using Emacs Ediff as Git Merge/Difftool

  gitemacsshellmergetooldifftool
  Language:Shell 23

• numandev1 / intellij-merge-tool

  VS Code extension for open merge tool of intellij

  vscode-extensionmergetoolmergeintellij
  Language:TypeScript 16

• agriffis / vimmerge

  vim wrapper for merges

  vimdiffmergegitmergetoolgit-mergetoolvimdiff
  Language:Shell 3

• TheRaphael0000 / diff_and_merge_raw_translation

  Merge images folders from scanlations and raws mangas, useful when the manga doesn't have an official translation

  mangascanlationrawsmergetoolimagehashimage-diffdiff
  Language:Python 3

• clayrisser / emacs-mergetool

  use emacs as git mergetool

  emacsgitmergemergetool
  Language:Shell 2

• ishansaksena / Conflerge

  Resolving conflict merges with ASTs

  gitmerge-conflictsabstract-syntax-treetokenizationmergetool
  Language:Java 2

• Wardergrip / SimpleUYM

  A GUI to open and configure Unity YAML Merge

  gitguimergetoolunityunityyamlmerge
  Language:C# 2

• asterix24 / MergeBom

  Bill of material merge utility.

  pythonaltium-designerbomelectronicscomponentsmergetoolfancy
  Language:Python 1

• hossam-magdy / GitSwitcher

  A quick reference or brief documentation as a summary of git commands and some handy tools & guides that are used in hands-on situations and improves the git knowledge. As well as GitSwitcher: a script that switches between git branches in an easy manner without typing any git command.

  gitgit-flowdifftoolmergetoolgit-workflowconflictuncommitted-changesstaging-areaupstreamtree
  Language:Shell 1

• robatwilliams / diff-hero

  Investigating diff tool moved block detection capabilities. See branches.

  diffmergetooldifftool
  Language:JavaScript 1

• ekisoffi / generator

  Rails-inspired generator system that provides scaffolding for your apps

  mergetool
  Language:JavaScript 0

• ghassanSaliby123 / Guide-to-Git

  This repository contains GIT commands illustrations and notes that were typed out through following a GIT course on Udemy. The course name is Git Complete: The definitive, step-by-step guide to Git by the instructor Jason Taylor

  command-linedifftoolgitmergetoolp4mergerepositoriesgithub
  0