Fix instruction for cherry pick way of fixing mixed branches (#13186)
Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
This commit is contained in:
parent
a21e6c3f33
commit
011684a05f
|
@ -289,7 +289,7 @@ and the last true master commit is `ccc111` and your first commit is `mmm222`.
|
||||||
```bash
|
```bash
|
||||||
git checkout my-branch
|
git checkout my-branch
|
||||||
# create a local backup of your branch
|
# create a local backup of your branch
|
||||||
git checkout -b my-branch-backup
|
git branch my-branch-backup
|
||||||
# reset your branch to the correct base
|
# reset your branch to the correct base
|
||||||
git reset release/1.2-dev --hard
|
git reset release/1.2-dev --hard
|
||||||
# ACTION: this step is much easier to do with IDE
|
# ACTION: this step is much easier to do with IDE
|
||||||
|
|
Loading…
Reference in New Issue