File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 3636 git push origin $TARGET_BRANCH || echo "Failed to push $TARGET_BRANCH"
3737 fi
3838 git reset --hard main
39- git push origin $TARGET_BRANCH --force || echo "Failed to force push $TARGET_BRANCH" - name: Sync with Content Branch
40- run : |
41- git checkout content
42- git pull origin content || echo "No changes to pull for content"
43- git reset --hard origin/main
44- git merge --squash origin/main || echo "No changes to merge for content"
45- if [ -n "$(git status --porcelain)" ]; then
46- git commit -m "Squash merge changes from main into content"
47- git push origin content || echo "Failed to push content branch"
48- fi
49- git reset --hard main
50- git push origin content --force || echo "Failed to force push content branch"
39+ git push origin $TARGET_BRANCH --force || echo "Failed to force push $TARGET_BRANCH"
You can’t perform that action at this time.
0 commit comments