15,091
edits
Changes
From Gramps
no edit summary
To create a local branch which tracks a branch on the server, use:
git checkout -b gramps51 gramps60 origin/maintenance/gramps51gramps60
= Updating a translation =
Create a branch to work in:
git checkout -b xx gramps51gramps60
Now edit the po file using your favorite method and once complete.
git commit -m 'Update xx translation'
You can update the ''gramps51gramps60'' branch at any time.
git checkout gramps51gramps60
git pull
You rebase your working branch on the ''gramps51gramps60'' branch at any time.
git checkout xx
git rebase gramps51gramps60
When you are ready to make a pull request, push your translation to your fork:
If you have recently pushed a branch to your fork, then GitHub will highlight this when you visit the repository page, and give you an option to create a pull request. Otherwise click on the "New pull request" button.
Make sure that you select "gramps51gramps60" as the base branch.
== Simple workflow for developers ==
Checkout the maintenance branch:
git checkout gramps51gramps60
Get the latest changes:
