diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2011-05-12 19:58:05 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2011-05-12 19:58:05 -0500 |
| commit | deea8ca727179ceb134c59bab4945cf6f7290fab (patch) | |
| tree | 0688854b56e278bbdc05bbd00e90404c590b9019 /railties/guides | |
| parent | e1ceae576e3911f3e6708b5d19a0e3ef63769eb7 (diff) | |
| download | rails-deea8ca727179ceb134c59bab4945cf6f7290fab.tar.gz rails-deea8ca727179ceb134c59bab4945cf6f7290fab.tar.bz2 rails-deea8ca727179ceb134c59bab4945cf6f7290fab.zip | |
Prefer topic branches instead of master branch for users contributions
Diffstat (limited to 'railties/guides')
| -rw-r--r-- | railties/guides/source/contributing_to_ruby_on_rails.textile | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/railties/guides/source/contributing_to_ruby_on_rails.textile b/railties/guides/source/contributing_to_ruby_on_rails.textile index a48355a833..5eb925d7d2 100644 --- a/railties/guides/source/contributing_to_ruby_on_rails.textile +++ b/railties/guides/source/contributing_to_ruby_on_rails.textile @@ -232,11 +232,11 @@ You can also help out by examining pull requests that have been submitted to Rub $ git checkout -b testing_branch </shell> -Then you can use their remote branch to update your codebase. For example, let's say the GitHub user JohnSmith has forked and pushed to the master branch located at https://github.com/JohnSmith/rails. +Then you can use their remote branch to update your codebase. For example, let's say the GitHub user JohnSmith has forked and pushed to the topic branch located at https://github.com/JohnSmith/rails. <shell> $ git remote add JohnSmith git://github.com/JohnSmith/rails.git -$ git pull JohnSmith master +$ git pull JohnSmith topic </shell> After applying their branch, test it out! Here are some things to think about: @@ -356,14 +356,16 @@ $ git remote add mine https://<your user name>@github.com/<your user name>/rails Push to your remote: <shell> -$ git push mine master +$ git push mine my_new_branch </shell> h4. Issue a Pull Request Navigate to the Rails repository you just pushed to (e.g. https://github.com/<your user name>/rails) and press "Pull Request" in the upper right hand corner. - -Ensure the changesets you introduced are included in the "Commits" tab and that the "Files Changed" incorporate all of your changes. + +Write your branch name in branch field (is filled with master by default) and press "Update Commit Range" + +Ensure the changesets you introduced are included in the "Commits" tab and that the "Files Changed" incorporate all of your changes. Fill in some details about your potential patch including a meaningful title. When finished, press "Send pull request." Rails Core will be notified about your submission. @@ -383,6 +385,7 @@ All contributions, either via master or docrails, get credit in "Rails Contribut h3. Changelog +* May 12, 2011: Modified to prefer topic branches instead of master branch for users contributions by "Guillermo Iguaran":http://quillarb.org * April 29, 2011: Reflect GitHub Issues and Pull Request workflow by "Dan Pickett":http://www.enlightsolutions.com * April 14, 2011: Modified Contributing to the Rails Code section to add '[#ticket_number state:commited]' on patches commit messages by "Sebastian Martinez":http://wyeworks.com * December 28, 2010: Complete revision by "Xavier Noria":credits.html#fxn |