From ce1d54e1bf624fde2457d5f699fea285bc7938d8 Mon Sep 17 00:00:00 2001
From: Eric Theise <erictheise@gmail.com>
Date: Wed, 10 Jul 2024 21:02:37 -0700
Subject: [PATCH] Part of
 https://github.com/OpenHistoricalMap/issues/issues/786, adjusting workflow.

---
 .github/workflows/ohm.upstream-sync.yml | 12 ++++++++----
 scripts/upstream_sync.sh                |  4 ----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ohm.upstream-sync.yml b/.github/workflows/ohm.upstream-sync.yml
index d65ac334..658731a7 100644
--- a/.github/workflows/ohm.upstream-sync.yml
+++ b/.github/workflows/ohm.upstream-sync.yml
@@ -53,16 +53,20 @@ jobs:
       - name: List all branches
         run: |
           git branch --all | egrep 'main|master|sacrifice'
-          git diff origin/main --name-only
 
       - name: Make our scripts executable
         run: chmod +x ./scripts/*.sh
       - name: Preserve upstream docs
         run: ./scripts/preserve_upstream_docs.sh
 
-      - name: Do a diff and start a merge
+      - name: Start the merge
         run: |
-          git diff main
-          git diff upstream/master
           git merge --no-ff --no-commit upstream/master
           git status
+
+      - name: Continue the merge where there are no concerns
+        run: ./scripts/upstream_sync.sh
+
+      - name: Push updates
+        run: |
+          git push origin the-sacrifice
diff --git a/scripts/upstream_sync.sh b/scripts/upstream_sync.sh
index 8cd2202c..1ab228e5 100755
--- a/scripts/upstream_sync.sh
+++ b/scripts/upstream_sync.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-
-
-
 concerns=('js/ide.js' 'js/map.ts')
 for i in $(git diff --name-only --diff-filter=U --relative);do
   echo "$i"
@@ -19,4 +16,3 @@ if [ -n "$(git status --porcelain)" ]; then
   iso=$(date -Iminutes)
   git commit -m "Merge upstream ("$iso")."
 fi
-git push origin the-sacrifice