Update update-flatpak-sources.yml

ToxicStoxm · Nov 25, 2024 · 32e4e36 · 32e4e36
1 parent 4318367
commit 32e4e36
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/.github/workflows/update-flatpak-sources.yml b/.github/workflows/update-flatpak-sources.yml
@@ -43,7 +43,15 @@ jobs:
               # Check if the branch exists remotely
               if git ls-remote --heads origin $BRANCH | grep -q $BRANCH; then
                   echo "Branch $BRANCH exists on remote. Creating a local tracking branch."
+                  
+                  # Temporarily stash changes
+                  git stash --include-untracked
+                  
+                  # Create a local branch that tracks the remote branch
                   git checkout -t origin/$BRANCH
+                  
+                  # Restore stashed changes
+                  git stash pop
               else
                   echo "Branch $BRANCH does not exist. Creating a new branch."
                   git checkout -b $BRANCH
@@ -63,3 +71,4 @@ jobs:
           fi
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+