Skip to content

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

Draft
Copilot wants to merge 2 commits intomainfrom
copilot/update-checks-status
Draft

Fix WF2 workflow: Add --autostash to git pull --rebase#91
Copilot wants to merge 2 commits intomainfrom
copilot/update-checks-status

Conversation

Copy link

Copilot AI commented Feb 1, 2026

WF2 Monthly Monitor fails with error: cannot pull with rebase: You have unstaged changes when workflow artifacts exist in the working directory.

Changes

  • Add --autostash flag to git pull --rebase in src/utils/git_ops.py
# Before
run_cmd(["git", "pull", "--rebase"])

# After  
run_cmd(["git", "pull", "--rebase", "--autostash"])

This handles edge cases where unstaged files (build artifacts, cache, etc.) exist outside the committed file set.

Original prompt

Reference: https://github.com/yajeddig/ResearchOps/commit/ae116af196b82656df7ede972817821c3b693f87/checks?check_suite_id=56040342067


💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

Co-authored-by: yajeddig <166155895+yajeddig@users.noreply.github.com>
Copilot AI changed the title [WIP] Update checks status in ResearchOps Fix WF2 workflow: Add --autostash to git pull --rebase Feb 1, 2026
Copilot AI requested a review from yajeddig February 1, 2026 08:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants