From 0c4c54dd04d01ca240bc4aabd6d15c09b1f0d59e Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Sat, 24 Jan 2026 13:15:41 +0100 Subject: [PATCH] Implemented pull and no rebase in config --- .gitea/workflows/push.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitea/workflows/push.yaml b/.gitea/workflows/push.yaml index 2c7c162..cb604b7 100644 --- a/.gitea/workflows/push.yaml +++ b/.gitea/workflows/push.yaml @@ -92,6 +92,7 @@ jobs: run: | git config --global user.name "Gitea Actions [bot]" git config --global user.email "actions@yannick-weigert.de" + git config pull.rebase false git pull origin ${{ gitea.ref_name }} git add pubspec.yaml git commit -m "Updated version number [skip ci]" @@ -131,6 +132,7 @@ jobs: if [ -n "$(git status --porcelain lib test)" ]; then git config --global user.name "Gitea Actions [bot]" git config --global user.email "actions@yannick-weigert.de" + git config pull.rebase false git pull origin ${{ gitea.ref_name }} git add lib test git commit -m "Updated licenses [skip ci]" @@ -182,6 +184,8 @@ jobs: if [ -n "$(git status --porcelain lib test)" ]; then git config --global user.name "Gitea Actions [bot]" git config --global user.email "actions@yannick-weigert.de" + git config pull.rebase false + git pull origin ${{ gitea.ref_name }} git add lib test git commit -m "Auto-format code [skip ci]" git push origin HEAD:${{ gitea.ref_name }}