From 7a84226b15dc7764dafc6231828c20f44eefc317 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 31 May 2025 05:32:50 +0200
Subject: [PATCH] Update onpush_builder.yaml

---
 .github/workflows/onpush_builder.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/onpush_builder.yaml b/.github/workflows/onpush_builder.yaml
index 76230efd8..3250591e8 100644
--- a/.github/workflows/onpush_builder.yaml
+++ b/.github/workflows/onpush_builder.yaml
@@ -61,9 +61,9 @@ jobs:
           commit: -u
           message: "GitHub bot: normalize and chmod"
           default_author: github_actions
-          pull: --rebase      # <--- add this line!
+          pull: --rebase --autostash
           fetch: --tags --force
-          push: true
+          push: --force
 
   # 3. Lint add-on configs
   lint_config:
@@ -194,6 +194,6 @@ jobs:
           commit: -u
           message: "GitHub bot: changelog"
           default_author: github_actions
-          pull: --rebase
+          pull: --rebase --autostash
           fetch: --force
           push: --force