Changes

Jump to: navigation, search

Git merge

26 bytes removed, 22:22, 6 November 2019
External links
* gpr_driver.py this does the merge for gpr.py files to deal with version number changes.
The three files need to be copies copied to your system in a convenient place. Since I use Windows, the path on my system is "C:\apps". Adjust your system path as appropriate here and in the .gitconfig file. Download https://gramps-project.org/wiki/index.php/File:Git_merge_drivers.zip [[:File:Git_merge_drivers.zip| (stored here)]] to a convenient location with your browser and unzip them.
Then you need to edit the .gitconfig file for your system, usually in your home directory.
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