Skip to content

Commit

Permalink
Using checkout action params to fetch all git branches
Browse files Browse the repository at this point in the history
  • Loading branch information
LikeTheSalad committed May 20, 2024
1 parent f3af5fd commit a42eea4
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .github/workflows/updateVersionBranch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ jobs:
email: ${{ env.GIT_EMAIL }}
token: ${{ env.GITHUB_TOKEN }}
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions-ecosystem/action-regex-match@v2
id: major-version
with:
Expand All @@ -36,7 +38,6 @@ jobs:

- run: |
CONFLICT_RESOLUTION_BRANCH="post-release/main-to-${{ env.BASE_BRANCH }}"
git fetch --all
git switch ${{ env.BASE_BRANCH }}
git checkout -b $CONFLICT_RESOLUTION_BRANCH
git merge main --strategy-option theirs
Expand Down

0 comments on commit a42eea4

Please sign in to comment.