We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent b0063bc commit def4046Copy full SHA for def4046
.github/auto-merge-hotfix.yml
@@ -0,0 +1,29 @@
1
+name: Auto Merge Hotfix into Develop
2
+
3
+on:
4
+ push:
5
+ branches:
6
+ - main # Trigger this action when code is pushed to 'main'
7
8
+jobs:
9
+ merge_hotfix_to_develop:
10
+ runs-on: ubuntu-latest
11
12
+ steps:
13
+ # Checkout the repository
14
+ - name: Checkout Repository
15
+ uses: actions/checkout@v2
16
17
+ # Set up Git
18
+ - name: Set up Git
19
+ run: |
20
+ git config user.name "GitHub Actions"
21
+ git config user.email "[email protected]"
22
23
+ # Merge the hotfix into develop
24
+ - name: Merge Hotfix into Develop
25
26
+ git checkout develop
27
+ git pull origin develop
28
+ git merge main --no-ff --commit -m "Merge hotfix from main into develop"
29
+ git push origin develop
0 commit comments