Changes

Jump to: navigation, search

Git merge

26 bytes removed, 22:22, 6 November 2019
External links
Then when a merge conflict comes up you can:
git mergetool
 
==See also==
*[[Brief introduction to Git]]
== External links ==
 
*[http://git-scm.com/ Git]
*[http://git-scm.com/book Git Book]
*[https://gramps-project.org/wiki/index.php/Brief_introduction_to_Git]
[[Category:Developers/General|B]]

Navigation menu