From 31a35c7d891e4912e39e31f666fd56d4d3580adc Mon Sep 17 00:00:00 2001 From: Youssef Aitousarrah Date: Tue, 14 Apr 2026 23:12:17 -0700 Subject: [PATCH] fix(workflow): use git stash --include-untracked to handle new untracked files Plain `git stash` only stashes tracked modified files. Scripts like track_recommendation_performance.py write new untracked files to data/recommendations/ which block `git pull --rebase`. Adding --include-untracked captures those files in the stash so the rebase can proceed cleanly. Co-Authored-By: Claude Sonnet 4.6 --- .github/workflows/daily-discovery.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/daily-discovery.yml b/.github/workflows/daily-discovery.yml index af576853..30cafc73 100644 --- a/.github/workflows/daily-discovery.yml +++ b/.github/workflows/daily-discovery.yml @@ -91,7 +91,7 @@ jobs: echo "No new recommendations to commit" else git commit -m "chore: daily discovery ${{ steps.date.outputs.analysis_date }}" - git stash || true + git stash --include-untracked || true git pull --rebase origin ${{ github.ref_name }} git stash pop || true git push origin ${{ github.ref_name }} @@ -112,7 +112,7 @@ jobs: echo "No performance updates" else git commit -m "chore: update performance tracking ${{ steps.date.outputs.analysis_date }}" - git stash || true + git stash --include-untracked || true git pull --rebase origin ${{ github.ref_name }} git stash pop || true git push origin ${{ github.ref_name }} @@ -135,7 +135,7 @@ jobs: echo "No position updates" else git commit -m "chore: update positions ${{ steps.date.outputs.analysis_date }}" - git stash || true + git stash --include-untracked || true git pull --rebase origin ${{ github.ref_name }} git stash pop || true git push origin ${{ github.ref_name }}