[Merger] Using upstream again

SakulFlee · Jun 20, 2023 · f2a0242 · f2a0242
1 parent 4b885c8
commit f2a0242
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/.github/workflows/upstream_merger.yml b/.github/workflows/upstream_merger.yml
@@ -42,9 +42,11 @@ jobs:
  git fetch --all
 
  echo "> Merging ..."
- git merge -s ours upstream/main origin/main
+ git checkout -b upstream || true
+ git switch upstream || true
+ git merge upstream/main origin/upstream || true
 
  echo "> Pushing ..."
  git add --all || true
  git commit -m "Upstream merge ($(date +%d.%m.%Y_%H:%M:%S))" || true
- git push origin main
+ git push origin upstream