#
conflict
Here are 3 public repositories matching this topic...
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.
git tree git-flow git-workflow upstream conflict mergetool staging-area difftool uncommitted-changes
-
Updated
Dec 3, 2017 - Shell
Learn to save and manage different versions of your code projects with this essential tool.
-
Updated
May 1, 2020 - Shell
Improve this page
Add a description, image, and links to the conflict topic page so that developers can more easily learn about it.
Add this topic to your repo
To associate your repository with the conflict topic, visit your repo's landing page and select "manage topics."