Fix diverged branch by fetching and checking out the head_ref

jjjermiah · Feb 3, 2024 · 06fd2e3 · 06fd2e3
1 parent 4f3e144
commit 06fd2e3
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -268,8 +268,10 @@ jobs:
           echo "Current branch is: ${{ github.head_ref }}"
           echo "Current branch is: ${{ github.base_ref }}"
           echo "Current branch is: ${{ github.event_name }}"
-          git config pull.ff only       # fast-forward only
-          git pull origin ${{ github.head_ref }}
+
+          # fix diverged branch
+          git fetch origin ${{ github.head_ref }}
+          git checkout ${{ github.head_ref }}
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4