mirror of
https://github.com/home-assistant/developers.home-assistant.git
synced 2025-07-16 05:46:30 +00:00
Recommend safer "git push --force-with-lease" (#732)
Co-authored-by: Franck Nijhof <frenck@frenck.nl>
This commit is contained in:
parent
e292a207ff
commit
8b991cede0
@ -31,6 +31,14 @@ After rebasing your branch, you will have rewritten history relative to your Git
|
||||
|
||||
```shell
|
||||
# Run this from your feature branch
|
||||
git push origin --force-with-lease
|
||||
```
|
||||
|
||||
If that command fails, it means that new work was pushed to the branch from either you or another contributor since your last rebase.
|
||||
You will have to start over the git fetch and rebase process described above, or if you are really confident those changes are not needed, just overwrite them:
|
||||
|
||||
```shell
|
||||
# Run this from your feature branch, overwriting any changes in the remote branch
|
||||
git push origin --force
|
||||
```
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user