Skip to content

Fix WF2 workflow: Add --autostash to git pull --rebase #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Fix WF2 workflow: Add --autostash to git pull --rebase #91

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c3e833
Initial plan
Copilot Feb 1, 2026
c269ad4
Fix WF2 workflow: Add --autostash to git pull --rebase
Feb 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/utils/git_ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ def safe_commit(files, message):
# 3. Commit locally BEFORE pull
run_cmd(["git", "commit", "-m", message])

# 4. Pull with rebase (now safe - working dir is clean)
run_cmd(["git", "pull", "--rebase"])
# 4. Pull with rebase (--autostash handles any uncommitted changes)
run_cmd(["git", "pull", "--rebase", "--autostash"])

# 5. Push
run_cmd(["git", "push"])
Expand Down