Skip to content

Commit f069e08

Browse files
silv-iolocalstack-bot
authored andcommitted
Force rebase on sync (#81)
1 parent e2ecfd9 commit f069e08

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
python-version: '3.13'
4646

4747
- name: Configure Git
48-
run: |
48+
run: |
4949
# Configure git
5050
git config --global user.name 'LocalStack Bot'
5151
git config --global user.email 'localstack-bot@users.noreply.github.com'
@@ -120,7 +120,7 @@ jobs:
120120
- name: Rebase localstack branch with latest master from upstream
121121
run: |
122122
git fetch upstream
123-
git rebase upstream/master
123+
git rebase -f upstream/master
124124
125125
- name: Determine new version
126126
run: |

0 commit comments

Comments
 (0)