kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

[CI SKIP] Improve force push note.

Browse source
This commit is contained in:
Guo Xiang Tan 2014-09-23 22:35:09 +08:00
parent e88f8d7dcb
commit c7bce61a22
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
guides/source/contributing_to_ruby_on_rails.md
View file

@ -563,17 +563,17 @@ been updated.
Sometimes you will be asked to make some changes to the code you have Sometimes you will be asked to make some changes to the code you have
already committed. This can include amending existing commits. In this already committed. This can include amending existing commits. In this
case git will not allow you to push the changes as the pushed version case Git will not allow you to push the changes as the pushed branch
and local version does not match. Instead of opening new pull request, and local branch do not match. Instead of opening a new pull request,
you can force push to your branch on Github like described earlier in you can force push to your branch on GitHub as described earlier in
squashing commits section: squashing commits section:
```bash ```bash
$ git push origin my_pull_request -f $ git push origin my_pull_request -f
``` ```
This will update the branch on Github with your new code and This will update the branch and pull request on GitHub with your new code. Do
Github will take care of updating the pull request with new code. note that using force push may result in commits being lost on the remote branch; use it with care.
### Older Versions of Ruby on Rails ### Older Versions of Ruby on Rails