Skip to content

Commit

Permalink
Fetch all branches before merging development into main
Browse files Browse the repository at this point in the history
  • Loading branch information
mechakdotdev committed Nov 23, 2024
1 parent cb43f09 commit 4d91e3a
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion .github/workflows/merge-dev-into-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Fetch Development Branch
run: git fetch origin development

- name: Set up Java
uses: actions/setup-java@v3
Expand All @@ -30,5 +35,5 @@ jobs:
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git checkout main
git pull origin main
git merge --no-ff development -m "Merge dev into main"
git merge --no-ff development -m "GitHub Action: Merge development branch into main"
git push origin main

0 comments on commit 4d91e3a

Please sign in to comment.