... | ... | @@ -205,8 +205,12 @@ the recent changes from master using |
|
|
git checkout feature1
|
|
|
git rebase master
|
|
|
```
|
|
|
**Note1:** When pushing you rebased branch to the origin, you need to force overwriting the existing branch, i.e. use
|
|
|
```bash
|
|
|
git push --force
|
|
|
```
|
|
|
|
|
|
**Note:** The above "rebase" command works only if the changes in feature1 are committed or stashed. Stash the work-in-progress changes in feature1 (if you are maintaining more than one stash please refer to documentation of stash to ensure stashes are not overwritten), rebase the master and the apply the stash back to your branch.
|
|
|
**Note2:** The above "rebase" command works only if the changes in feature1 are committed or stashed. Stash the work-in-progress changes in feature1 (if you are maintaining more than one stash please refer to documentation of stash to ensure stashes are not overwritten), rebase the master and the apply the stash back to your branch.
|
|
|
```bash
|
|
|
git checkout feature1
|
|
|
git stash
|
... | ... | |