From 673fec1b6db4404f0d2c7ef2131da567afcfd5bb Mon Sep 17 00:00:00 2001
From: eliasbruvik <elias.kristoffer.bruvik@gmail.com>
Date: Mon, 13 Nov 2023 11:14:46 +0100
Subject: [PATCH] Setup upstream merge schedule

---
 .github/workflows/merge_upstream.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .github/workflows/merge_upstream.yml

diff --git a/.github/workflows/merge_upstream.yml b/.github/workflows/merge_upstream.yml
new file mode 100644
index 000000000..9392aafbb
--- /dev/null
+++ b/.github/workflows/merge_upstream.yml
@@ -0,0 +1,20 @@
+name: Merge upstream main
+on:
+  schedule:
+    - cron:  '0 06,12 * * *'
+  workflow_dispatch:
+jobs:
+  merge:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - name: Merge upstream
+        run: |
+          git pull --unshallow
+
+          git remote add upstream https://github.com/equinor/witsml-explorer.git
+          git fetch upstream main
+
+          git checkout main
+          git merge --no-edit upstream/main
+          git push origin main