...
9. Push the updated master back to your fork.
$ git push |
|---|
Note: it was suggested to use git checkout master, then git pull origin master in preference to above (to be discussed).
10. Start new feature.
$ git checkout new-feature2 |
|---|
...
$ git checkout master $ git fetch upstream $ git merge --ff-only upstream/master $ git checkout new-feature $ git rebase master |
|---|
...
master |
|---|
...
13. Make changes.
14. Update the PR killing off the older changes.
...