Skip to content

Commit

Permalink
Merge pull request #687 from CHTC/master
Browse files Browse the repository at this point in the history
Merge web preview update to current branch
  • Loading branch information
aowen-uwmad authored Jan 23, 2024
2 parents a1a3786 + dbe9b2b commit 743aaf1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
SPLIT_BRANCH=$(git subtree split --prefix temp-dir temp-branch)
git remote add web-preview ${{ env.preview_url }}
git fetch --all
git fetch web-preview
git checkout -b preview web-preview/main
git merge $SPLIT_BRANCH -m "Merge Split Branch" --allow-unrelated-histories -X theirs
git push web-preview HEAD:main
Expand Down

0 comments on commit 743aaf1

Please sign in to comment.