From aa7273477e99fe8bd6ad59a6e28c3f3e48386bb5 Mon Sep 17 00:00:00 2001 From: dan-mm Date: Thu, 27 Jul 2023 15:11:34 +0200 Subject: [PATCH] make update_fork workflow work with branches of forks (will still sync with main branch of upstream) --- .github/workflows/update_fork.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update_fork.yml b/.github/workflows/update_fork.yml index 60b0cb6f..f34a915c 100644 --- a/.github/workflows/update_fork.yml +++ b/.github/workflows/update_fork.yml @@ -31,7 +31,7 @@ jobs: CHANGES=$(git rev-list HEAD..upstream/master --count) if [ "$CHANGES" -gt 0 ]; then echo "Updating fork..." - git checkout master + git checkout ${{ github.ref_name }} git merge upstream/master git push else