Update UpdateFork.yml

chrisisth · Sep 13, 2024 · 0e07d0c · 0e07d0c
1 parent 7826300
commit 0e07d0c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/.github/workflows/UpdateFork.yml b/.github/workflows/UpdateFork.yml
@@ -21,8 +21,11 @@ jobs:
       - name: Fetch Upstream
         run: git fetch upstream
 
+      - name: List Upstream Branches
+        run: git branch -r
+
       - name: Merge Upstream
-        run: git merge upstream/main
+        run: git merge upstream/main || echo "Merge conflicts detected. Please resolve them manually."
 
       - name: Push Changes
-        run: git push origin main
+        run: git push origin main || echo "Push failed. Please check your token and permissions."