If a user has set their default git pull mode to rebase, then they will get stuck with errors when trying to commit changes e.g.:
$ sr3_commit credentials.conf
error: cannot pull with rebase: You have unstaged changes.
error: please commit or stash them.
[ERROR] Problem updating local repository. Please resolve manually and retry.
I think the sr3_tools code should be changed to use git pull -ff to avoid this, but it needs some investigation and testing.
If a user has set their default
git pullmode to rebase, then they will get stuck with errors when trying to commit changes e.g.:I think the sr3_tools code should be changed to use
git pull -ffto avoid this, but it needs some investigation and testing.