GitHub topics: mergetool
jupyter/nbdime
Tools for diffing and merging of Jupyter notebooks.
Language: TypeScript - Size: 14.1 MB - Last synced at: 3 days ago - Pushed at: 7 months ago - Stars: 2,738 - Forks: 166
PeterJRiches/sudomerge
Is to a merge tool what `sudoedit` is to an editor
Language: Shell - Size: 19.5 KB - Last synced at: 8 days ago - Pushed at: 8 days ago - Stars: 0 - Forks: 0
whiteinge/diffconflicts
A better Vimdiff Git mergetool
Language: Vim Script - Size: 729 KB - Last synced at: 28 days ago - Pushed at: over 1 year ago - Stars: 410 - Forks: 20
samoshkin/vim-mergetool
:cake: Efficient way of using Vim as a Git mergetool
Language: Vim script - Size: 7.05 MB - Last synced at: 24 days ago - Pushed at: over 4 years ago - Stars: 297 - Forks: 12
agriffis/vimmerge
vim wrapper for merges
Language: Shell - Size: 393 KB - Last synced at: 24 days ago - Pushed at: about 7 years ago - Stars: 4 - Forks: 0
asterix24/MergeBom
Bill of material merge utility.
Language: Python - Size: 17.7 MB - Last synced at: 9 months ago - Pushed at: 9 months ago - Stars: 2 - Forks: 6
clayrisser/emacs-mergetool
use emacs as git mergetool
Language: Shell - Size: 627 KB - Last synced at: 7 days ago - Pushed at: almost 2 years ago - Stars: 2 - Forks: 0
Wardergrip/SimpleUYM
A GUI to open and configure Unity YAML Merge
Language: C# - Size: 103 KB - Last synced at: over 1 year ago - Pushed at: over 1 year ago - Stars: 2 - Forks: 0
numandev1/intellij-merge-tool
VS Code extension for open merge tool of intellij
Language: TypeScript - Size: 653 KB - Last synced at: 13 days ago - Pushed at: about 4 years ago - Stars: 16 - Forks: 2
paulotome/emacstool
Using Emacs Ediff as Git Merge/Difftool
Language: Shell - Size: 4.88 KB - Last synced at: over 1 year ago - Pushed at: over 5 years ago - Stars: 19 - Forks: 1
ishansaksena/Conflerge
Resolving conflict merges with ASTs
Language: Java - Size: 3.62 MB - Last synced at: about 2 years ago - Pushed at: about 8 years ago - Stars: 2 - Forks: 1
lenormf/kakmerge
A Kakoune-based mergetool for Git
Language: Shell - Size: 84 KB - Last synced at: about 2 years ago - Pushed at: over 4 years ago - Stars: 36 - Forks: 2
robatwilliams/diff-hero 📦
Investigating diff tool moved block detection capabilities. See branches.
Language: JavaScript - Size: 1.95 KB - Last synced at: 4 months ago - Pushed at: over 6 years ago - Stars: 1 - Forks: 0
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.
Language: Shell - Size: 42 KB - Last synced at: about 2 years ago - Pushed at: over 7 years ago - Stars: 1 - Forks: 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
Size: 1.27 MB - Last synced at: about 2 years ago - Pushed at: over 2 years ago - Stars: 0 - Forks: 0
TheRaphael0000/diff_and_merge_raw_translation
Merge images folders from scanlations and raws mangas, useful when the manga doesn't have an official translation
Language: Python - Size: 20.5 KB - Last synced at: 24 days ago - Pushed at: almost 2 years ago - Stars: 3 - Forks: 0
