We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 3aece12 commit 089f7d4Copy full SHA for 089f7d4
1 file changed
.github/workflows/sync-branches.yml
@@ -14,11 +14,11 @@ jobs:
14
15
- name: Check Main Branch Status
16
run: |
17
- git fetch origin/main
18
- local_ref=$(git rev-parse HEAD)
19
- remote_ref=$(git rev-parse origin)
+ local_ref=$(git rev-parse main)
+ remote_ref=$(git rev-parse origin/main)
20
if [ "$local_ref" != "$remote_ref" ]; then
21
echo "HEAD is behind origin/main. Merging..."
+ git fetch origin/main
22
git merge origin/main -m "Actions workflow: auto-merge origin/main -> main"
23
fi
24
0 commit comments