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 e50a053 commit 18e3b59Copy full SHA for 18e3b59
.github/workflows/sync-upstream.yaml
@@ -7,6 +7,7 @@ on:
7
8
jobs:
9
sync:
10
+ name: Sync repository with upstream repository
11
runs-on: ubuntu-latest
12
steps:
13
- name: Checkout fork
@@ -22,13 +23,13 @@ jobs:
22
23
24
- name: Add upstream remote
25
run: |
- git remote add upstream git@github.com:codegouvfr/sill.git
26
+ git remote add upstream https://github.com/codegouvfr/sill.git
27
git fetch upstream
28
- - name: Merge upstream/main
29
+ - name: Sync with upstream/main
30
31
git checkout main
- git rebase upstream/main
32
+ git reset --hard upstream/main
33
34
- name: Push to origin
- run: git push origin main --no-verify
35
+ run: git push origin main --force-with-lease --no-verify
0 commit comments