Skip to content

Commit

Permalink
[Actions] Correctly sync release branch with main v2
Browse files Browse the repository at this point in the history
Attempt to resolve issue:
> fatal: refusing to merge unrelated histories
  • Loading branch information
CristianLara committed Dec 18, 2024
1 parent 726a177 commit 8afc232
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .github/workflows/publish_website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ jobs:
ref: 'docusaurus-versions' # release branch
- name: Sync release branch with main
run: |
git fetch && git merge origin/main
git fetch origin main:main
git merge main
- name: Set up Python
uses: actions/setup-python@v5
with:
Expand Down

0 comments on commit 8afc232

Please sign in to comment.