🖖
- Germany
Block or Report
Block or report mer0mingian
Report abuse
Contact GitHub support about this user’s behavior. Learn more about reporting abuse.
Report abusePinned
-
How to use `git mergetool` to resolv...
How to use `git mergetool` to resolve conflicts 1# Awesome git
23## General tutorial
4* [Kickstart tutorial](https://gist.github.com/jtebert/6d7367a3d6134aced57b6a3bf2bc11fc)
5* [Must-read tutorial: the concepts of branching and merging](http://www.sbf5.com/~cduan/technical/git/git-3.shtml) note the collaborating link at the bottom
Something went wrong, please refresh the page to try again.
If the problem persists, check the GitHub status page or contact support.
If the problem persists, check the GitHub status page or contact support.