16,736
edits
Changes
From Gramps
→Stable version
There are several versions of the Gramps source code in Git. The development branch for small changes and bug fixes is
''maintenance/gramps50gramps51''
By default, the remote server you cloned the Gramps repository from is called ''origin'', unless you changed the setup as described above. In that case it is ''upstream''.
To create a local branch which tracks a branch on the server, use:
git checkout -b gramps50 gramps51 upstream/maintenance/gramps50gramps51
{{man warn|1=Warning|2=This sets the name of the local branch to "gramps50gramps51" (not "maintenance/gramps50gramps51"). This may cause problems when you come to "push" your changes back to the server, depending on the "push.default" configuration settings (see below). You can change the name of the local branch by "git branch -m old new" i.e. git branch -m gramps50 gramps51 maintenance/gramps50gramps51}}
This is known as a "tracking" branch.
{{man warn|1=Warning|2=This will push committed changes from '''all''' local branches, not just the one that is currently checked-out. If you want to ensure that only one branch is pushed, then use:
git push origin gramps50gramps51:maintenance/gramps50gramps51}}
While it is certainly possible to do your contributions directly in the particular branch you start from, whether it be 'master' 'maintenance/gramps50gramps51' or something else, it is more usual to create a branch of your own for each significant change. That way you can work on each separately, and change from one to the other without getting the changes intermixed.
For example if you are creating a new report you might want to call the branch 'gen-report'. If you are basing this off of the 'master' branch, then you would start by:
