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 330d095 commit 76302e0Copy full SHA for 76302e0
.github/actions/merge-main/action.yml
@@ -9,6 +9,8 @@ runs:
9
steps:
10
- name: Checkout repository
11
uses: actions/checkout@v4
12
+ with:
13
+ fetch-depth: 0
14
15
- name: Set up Git
16
shell: bash
.github/scripts/merge-main.sh
@@ -69,7 +69,7 @@ function merge_main() {
69
echo "...switching to branch: $branch"
70
git switch "$branch"
71
echo "...merging main"
72
- git merge -m "misc: merge from main" main
+ git merge -m "misc: merge from main" origin/main
73
if [ $? -eq 0 ]; then
74
echo "...pushing to origin"
75
git push origin "$branch"
0 commit comments