make --squash optional and add note about when to use it
Some checks failed
ci/woodpecker/push/build Pipeline was successful
ci/woodpecker/push/lint-foundkey-js Pipeline was successful
ci/woodpecker/push/lint-backend Pipeline was successful
ci/woodpecker/push/lint-client Pipeline was successful
ci/woodpecker/push/lint-sw Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/pr/lint-foundkey-js Pipeline failed
ci/woodpecker/pr/lint-backend Pipeline failed
ci/woodpecker/pr/lint-client Pipeline failed
ci/woodpecker/pr/build Pipeline was successful
ci/woodpecker/pr/lint-sw Pipeline failed
ci/woodpecker/pr/test Pipeline failed
Some checks failed
ci/woodpecker/push/build Pipeline was successful
ci/woodpecker/push/lint-foundkey-js Pipeline was successful
ci/woodpecker/push/lint-backend Pipeline was successful
ci/woodpecker/push/lint-client Pipeline was successful
ci/woodpecker/push/lint-sw Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/pr/lint-foundkey-js Pipeline failed
ci/woodpecker/pr/lint-backend Pipeline failed
ci/woodpecker/pr/lint-client Pipeline failed
ci/woodpecker/pr/build Pipeline was successful
ci/woodpecker/pr/lint-sw Pipeline failed
ci/woodpecker/pr/test Pipeline failed
This commit is contained in:
parent
cde977588b
commit
a55da375ce
1 changed files with 3 additions and 3 deletions
|
@ -192,11 +192,11 @@ rc-service foundkey start
|
||||||
You can check if the service is running with `rc-service foundkey status`.
|
You can check if the service is running with `rc-service foundkey status`.
|
||||||
|
|
||||||
### Updating FoundKey
|
### Updating FoundKey
|
||||||
When a new release comes out, simply fetch and merge in the new tag. Here we opt to squash upstream commits as it allows for easy reverts in case something goes wrong.
|
When a new release comes out, simply fetch and merge in the new tag. If you plan on making additional changes on top of that tag, we suggest using the `--squash` option with `git merge`.
|
||||||
```sh
|
```sh
|
||||||
git fetch -t
|
git fetch -t
|
||||||
git merge tags/v13.0.0-preview2 --squash
|
git merge tags/v13.0.0-preview2
|
||||||
# you are now on the "next" release
|
# you are now on the "next" release
|
||||||
```
|
```
|
||||||
|
|
||||||
Now you'll want to update your dependencies and rebuild:
|
Now you'll want to update your dependencies and rebuild:
|
||||||
|
|
Loading…
Reference in a new issue