sr3_commit (or other commands that run `git pull`) don't work as expected when using rebase mode
Nobody has claimed this yet.
- Dominant language
- Shell
- Stars
- 0
- Forks
- 0
- PR merge metrics
- No merged PRs in 30d
Description
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.
Contributor guide
No contributing guide indexed for this repository
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Research direction
Inspect the sr3_tools commands that run `git pull`, starting with `sr3_commit` and the repository’s other command entry points. Reproduce the failure with Git configured for rebase mode and unstaged changes, then investigate the proposed `git pull -ff` behavior. Confirm that the affected commands complete successfully and that existing update-error handling still works.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- git, shell
- Domain
- cli
- Issue type
- Bug
- Difficulty
- 3/5
- Estimated time
- 1-2 days
- Activity status
- Quiet
- Clarity
- Mostly clear
- Newbie friendliness
- 64/100