Skip to content

Commit

Permalink
Main should rebase on Development after a merge (#5)
Browse files Browse the repository at this point in the history
  • Loading branch information
mechakdotdev authored Sep 19, 2024
1 parent c8b30d5 commit 29aa726
Showing 1 changed file with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Rebase development onto main
name: Rebase main onto development

on:
push:
branches:
- main
- development

jobs:
rebase:
Expand All @@ -26,9 +26,9 @@ jobs:
- name: Rebase development onto main
run: |
git fetch origin
git checkout development
git rebase origin/main
git checkout main
git rebase origin/development
- name: Push changes
run: |
git push origin development --force
git push origin main --force

0 comments on commit 29aa726

Please sign in to comment.