From 3263a37074a73505c1641525479a69069ff8a847 Mon Sep 17 00:00:00 2001
From: Julian Mutter <julian.mutter@comumail.de>
Date: Sun, 23 Mar 2025 18:56:50 +0100
Subject: [PATCH] workflow: push right after rebasing

---
 .gitea/workflows/update-flake.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/update-flake.yaml b/.gitea/workflows/update-flake.yaml
index 8bbb2b2..9824424 100644
--- a/.gitea/workflows/update-flake.yaml
+++ b/.gitea/workflows/update-flake.yaml
@@ -22,7 +22,7 @@ jobs:
           git config user.name "Gitea Actions"
           git config user.email "actions@gitea.local"
 
-      - name: Merge main branch
+      - name: Rebase from main branch
         shell: bash
         run: |
             commits_ahead=$(git rev-list --count HEAD..origin/main)
@@ -35,6 +35,7 @@ jobs:
             if [ $commits_ahead -ne 0 ]
             then
               git rebase -X theirs origin/main
+              git push --force-with-lease origin flake-updates
             else
               echo "Rebase not necessary"
             fi