Skip to content

Commit

Permalink
fixed merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
santiagoC committed Jan 14, 2025
1 parent d5776f8 commit 6964cb9
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,20 +90,19 @@ jobs:

merge-to-main:
needs: build-release-and-deploy
name: Merge Stage to Main
name: Merge Stage with Main
permissions:
contents: write
runs-on: ubuntu-latest
steps:
# Checkout the repository
- name: Checkout Code
uses: actions/checkout@v3
with:
ref: stage # Checkout the stage branch
- uses: actions/checkout@v3

# Merge stage into main
# Merge stage -> main
- name: Merge Stage into Main
uses: devmasx/merge-branch@v1.6.1
uses: devmasx/merge-branch@master
with:
type: now
head_to_merge: stage
target_branch: main
github_token: ${{ secrets.GITHUB_TOKEN }}
github_token: ${{ secrets.GITHUB_TOKEN }}

0 comments on commit 6964cb9

Please sign in to comment.