Skip to content

Commit

Permalink
Prefer development changes in case of merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
mechakdotdev committed Nov 23, 2024
1 parent 461e52b commit 129d063
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/merge-dev-into-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ jobs:
git checkout main
git pull origin main
git merge --no-ff origin/development -m "GitHub Action: Merge development branch into main"
git push origin main
git push --force origin main

0 comments on commit 129d063

Please sign in to comment.