Changes between Version 8 and Version 9 of CollaborateOnGithub

Timestamp:

Jan 17, 2009, 8:03:53 AM (16 years ago)

Author:

mrts

Comment:

--

CollaborateOnGithub

@@ -43 +43 @@
 
  1. Create a fork of the automatically updated Django SVN trunk mirror on !GitHub by clicking ''fork'' at http://github.com/django/django/tree/master
- 1. Describe the design of the feature you implement on the !GitHub project wiki, list tasks that need tackling so that contributors get a clear overview and can pick tasks easily.
+ 1. Describe the design of the feature you implement on the !GitHub project wiki, list tasks that need tackling so that contributors can pick them easily.
  1. Clone the fork to your workstation:
  {{{
@@ -73 +73 @@
 
 When a lieutenant receives a pull request: 
- 1. Review the diff with !GitHub web tools
+ 1. Review the commit list that is listed in the pull request
+ 1. If everything looks good, pull code from the the contributor's repository: 
+ {{{
+$ git remote add -f CONTRIBUTOR_NICK_HERE git://github.com/CONTRIBUTOR_NICK_HERE/django.git
+$ git checkout -b CONTRIBUTOR_NICK_HERE/master
+$ git pull CONTRIBUTOR_NICK_HERE master # for current or master:XXXXXXX, where XXXXXX is the changeset code received in pull request 
+ }}}
+ 1. Merge changes with the master branch:
+ {{{
+$ git checkout master
+$ git merge CONTRIBUTOR_NICK_HERE/master
+ }}}
+ 1. Run tests
+ 1. If tests pass, push changes to your public repository:
+ {{{
+$ git push
+ }}}
 
 === Contributor ===