Update upstream_merger.yml

Signed-off-by: Lukas Weber <me@sakul6499.de>
SakulFlee · Jul 5, 2023 · e368b61 · e368b61
1 parent f2a0242
commit e368b61
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/.github/workflows/upstream_merger.yml b/.github/workflows/upstream_merger.yml
@@ -42,11 +42,9 @@ jobs:
  git fetch --all
 
  echo "> Merging ..."
- git checkout -b upstream || true
- git switch upstream || true
- git merge upstream/main origin/upstream || true
+ git merge -s theirs upstream/main origin/main
 
  echo "> Pushing ..."
  git add --all || true
  git commit -m "Upstream merge ($(date +%d.%m.%Y_%H:%M:%S))" || true
- git push origin upstream
+ git push origin main