You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: .github/workflows/deploy-module.yml
+2-1Lines changed: 2 additions & 1 deletion
Original file line number
Diff line number
Diff line change
@@ -94,7 +94,8 @@ jobs:
94
94
- name: Merge main -> develop
95
95
# This step merges the main branch into the develop branch after a successful deployment. This ensures that the develop branch includes the tag for the latest release.
96
96
run: |
97
-
git fetch --unshallow
97
+
git checkout main
98
+
git pull
98
99
git checkout develop
99
100
git pull
100
101
git merge --no-ff main -m "Auto-merge main back to dev"
0 commit comments