OK, I ran into the problem again after Vassilii commited my GEDCOM patch to the repo. Now, when I run git pull without rebase, I see:
enno@enno-desktop ~/Gramps $ git pull
error: Your local changes to the following files would be overwritten by merge:
Please, commit your changes or stash them before you can merge.
enno@enno-desktop ~/Gramps $ git status -uno
# On branch gramps34
# Your branch and 'origin/maintenance/gramps34' have diverged,
# and have 3 and 3 different commits each, respectively.
# (use "git pull" to merge the remote branch into yours)
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
# modified: src/Filters/Rules/Person/_IsAncestorOf.py
# modified: src/Filters/Rules/Person/_IsRelatedWith.py
# modified: src/Relationship.py
# modified: src/glade/editcitation.glade
# modified: src/plugins/export/ExportGedcom.py
# modified: src/plugins/lib/libgedcom.py
# modified: src/plugins/lib/libpersonview.py
# modified: src/plugins/tool/PatchNames.py
no changes added to commit (use "git add" and/or "git commit -a")
Of the modified files, most are intentional, as I really want to run my personal hacks, except that the 2 GEDCOM related files should be merged. Same for an earlier local commit of o/nl.po that I did to be able to pull again after that file was changed in the repo.