diff options
| author | Guo Xiang Tan <tgx_world@hotmail.com> | 2014-09-23 22:35:09 +0800 |
|---|---|---|
| committer | Guo Xiang Tan <tgx_world@hotmail.com> | 2014-09-23 22:38:13 +0800 |
| commit | c7bce61a224c15c59db9664940351d830fc92ce1 (patch) | |
| tree | a66231a910e4a92c5d7afc8e78ec097a053b429b /guides | |
| parent | e88f8d7dcb325aaf27a7a92af766b6dbce43337a (diff) | |
| download | rails-c7bce61a224c15c59db9664940351d830fc92ce1.tar.gz rails-c7bce61a224c15c59db9664940351d830fc92ce1.tar.bz2 rails-c7bce61a224c15c59db9664940351d830fc92ce1.zip | |
[CI SKIP] Improve force push note.
Diffstat (limited to 'guides')
| -rw-r--r-- | guides/source/contributing_to_ruby_on_rails.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/guides/source/contributing_to_ruby_on_rails.md b/guides/source/contributing_to_ruby_on_rails.md index 0266a92d07..302c4ca9c0 100644 --- a/guides/source/contributing_to_ruby_on_rails.md +++ b/guides/source/contributing_to_ruby_on_rails.md @@ -563,17 +563,17 @@ been updated. Sometimes you will be asked to make some changes to the code you have already committed. This can include amending existing commits. In this -case git will not allow you to push the changes as the pushed version -and local version does not match. Instead of opening new pull request, -you can force push to your branch on Github like described earlier in +case Git will not allow you to push the changes as the pushed branch +and local branch do not match. Instead of opening a new pull request, +you can force push to your branch on GitHub as described earlier in squashing commits section: ```bash $ git push origin my_pull_request -f ``` -This will update the branch on Github with your new code and -Github will take care of updating the pull request with new code. +This will update the branch and pull request on GitHub with your new code. Do +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 |