@@ -93,13 +107,24 @@ of conflict, you need to do the update manually. You need to do the following on
...
@@ -93,13 +107,24 @@ of conflict, you need to do the update manually. You need to do the following on
your local repository:
your local repository:
```shell
```shell
git checkout MY_COOL_STUFF_BRANCH
git checkout MY_COOL_STUFF_BRANCH
git pull --rebase upstream HEAD
git pull upstream develop
# You may need to resolve the conflict according to the git prompt.
# You may need to resolve the conflict according to the git prompt.
# Make and test your code.
# Make and test your code.
git push -f origin HEAD
git push origin MY_COOL_STUFF_BRANCH
```
```
Now your Pull Request is updated with the latest version.
Now your Pull Request is updated with the latest version.
## Revise your pull request
## Revise your pull request
When you revise your pull request according to reviewer's comments, please use 'git commit' instead of 'git commit --amend' to commit your changes so that the reviewers can see the difference between the new pull requrest and the old pull request.
When you revise your pull request according to reviewer's comments, please use 'git commit' instead of 'git commit --amend' to commit your changes so that the reviewers can see the difference between the new pull requrest and the old pull request.
The possible commands are
```shell
git checkout MY_COOL_STUFF_BRANCH
git pull upstream develop # update local to newest code base.