Resolving conflict merges with ASTs
-
Updated
Mar 18, 2017 - Java
Resolving conflict merges with ASTs
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.
Rails-inspired generator system that provides scaffolding for your apps
🍰 Efficient way of using Vim as a Git mergetool
VS Code extension for open merge tool of intellij
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
Merge images folders from scanlations and raws mangas, useful when the manga doesn't have an official translation
Bill of material merge utility.
A GUI to open and configure Unity YAML Merge
Tools for diffing and merging of Jupyter notebooks.
Add a description, image, and links to the mergetool topic page so that developers can more easily learn about it.
To associate your repository with the mergetool topic, visit your repo's landing page and select "manage topics."