Skip to content

Commit 10adab5

Browse files
committed
fix: use --autostash on git pull --rebase in scholar_sync workflow
The fetch_scholar.py script writes data/*.json files before the rebase step, causing "unstaged changes" to block git pull --rebase. --autostash stashes them automatically, applies the rebase, then pops the stash. https://claude.ai/code/session_01H9ZTtwKumBU77azztFJ8Ky
1 parent 4a1fcfe commit 10adab5

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

.github/workflows/scholar_sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
run: |
3434
git config user.name "github-actions[bot]"
3535
git config user.email "github-actions[bot]@users.noreply.github.com"
36-
git pull origin main --rebase
36+
git pull origin main --rebase --autostash
3737
git add data/scholar_data.json data/scholar_papers.json
3838
git diff --cached --quiet && echo "Nothing to commit" && exit 0
3939
git commit -m "chore: scholar sync $(date -u +'%Y-%m-%d')"

0 commit comments

Comments
 (0)