Skip to content

Commit e1567af

Browse files
authored
chore: fix sync main to experimental when branches diverge (#1167)
Signed-off-by: Aga <aga@besz.me>
1 parent a3e1759 commit e1567af

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

.github/workflows/sync-main-to-experimental.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
run: |
2424
git config user.name "github-actions[bot]"
2525
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
26+
git config pull.rebase false # Always merge, never rebase
2627
2728
- name: Sync main into experimental branch
2829
run: |

0 commit comments

Comments
 (0)