deal with diverged histories

Added Force Merge Upstream Changes to first detect changes from upstream, and if updates are required, perform the forced merge before creating the pull request.
wildlifeai · Aug 24, 2024 · e0cf6d3 · e0cf6d3
1 parent 1b9bef6
commit e0cf6d3
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/.github/workflows/check-upstream-updates.yml b/.github/workflows/check-upstream-updates.yml
@@ -39,6 +39,11 @@ jobs:
           echo "status=up_to_date" >> $GITHUB_OUTPUT
         fi
 
+    - name: Force merge upstream changes
+      if: steps.check_updates.outputs.status == 'needs_update'
+      run: |
+        git merge upstream/main --allow-unrelated-histories -m "Merge upstream changes"
+        
     - name: Create Pull Request
       if: steps.check_updates.outputs.status == 'needs_update'
       uses: peter-evans/create-pull-request@v6