kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Merge pull request #34075 from hakusaro/guides-reference-leases 

Change contributing guide to suggest using safer force push
This commit is contained in:
Gannon McGibbon 2018-10-09 14:38:39 -04:00 committed by GitHub
parent 1ddfee9d11 cbafd5d225
commit 168a9728dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
guides/source/contributing_to_ruby_on_rails.md
View File

@ -596,13 +596,13 @@ $ git rebase -i rails/master
< Choose 'squash' for all of your commits except the first one. > < Choose 'squash' for all of your commits except the first one. >
< Edit the commit message to make sense, and describe all your changes. > < Edit the commit message to make sense, and describe all your changes. >
$ git push fork my_new_branch -f $ git push fork my_new_branch --force-with-lease
``` ```
You should be able to refresh the pull request on GitHub and see that it has You should be able to refresh the pull request on GitHub and see that it has
been updated. been updated.
#### Updating pull request #### Updating a pull request
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
@ -612,12 +612,13 @@ you can force push to your branch on GitHub as described earlier in
squashing commits section: squashing commits section:
```bash ```bash
$ git push fork my_new_branch -f $ git push fork my_new_branch --force-with-lease
``` ```
This will update the branch and pull request on GitHub with your new code. Do This will update the branch and pull request on GitHub with your new code.
note that using force push may result in commits being lost on the remote branch; use it with care. By force pushing with `--force-with-lease`, git will more safely update
the remote than with a typical `-f`, which can delete work from the remote
that you don't already have.
### Older Versions of Ruby on Rails ### Older Versions of Ruby on Rails