Merge pull request #9849 from Expensify/Rory-FixUpdateProtectedBranch

Expensify · Jul 12, 2022 · 3d86b5c · 3d86b5c
2 parents 0e06a9b + 7ceed5b
commit 3d86b5c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/.github/actions/composite/updateProtectedBranch/action.yml b/.github/actions/composite/updateProtectedBranch/action.yml
@@ -51,11 +51,14 @@ runs:
       with:
         GPG_PASSPHRASE: ${{ inputs.GPG_PASSPHRASE }}
 
-    - name: Checkout source branch
+    - name: Update target and source branches
       shell: bash
       run: |
         git fetch
+        git checkout ${{ env.TARGET_BRANCH }}
+        git merge origin/${{ env.TARGET_BRANCH }}
         git checkout ${{ env.SOURCE_BRANCH }}
+        git merge origin/${{ env.SOURCE_BRANCH }}
 
     - name: Set New Version
       shell: bash