Changes between Version 6 and Version 7 of CollaborateOnGithub

Timestamp:

Jan 17, 2009, 7:50:42 AM (15 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 !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 get a clear overview and can pick tasks easily.
  1. Clone the fork to your workstation:
  {{{
@@ -66 +66 @@
 git pull upstream master
  }}}
- 1. When the feature is ready, get in contact with a core developer to integrate your work.
+ 1. When the feature is ready, get in contact with a core developer (the ''dictator'') to integrate your work.
 
 ==== Managing contributor submissions ====
 
-When a contributor feels that his updates are ready to be merged back to lieutenant's repository, he should submit a pull request to the lieutenant (see below).
- 
+When a contributor feels that his updates are ready to be merged back to lieutenant's repository, he should submit a '''pull request''' to the lieutenant (see below).
+
 When a lieutenant receives a pull request: 
+ 1. Review the diff with !GitHub web tools
 
 === Contributor ===
+
+Largely, this is a copy-paste of the lieutenant workflow, only the tracked repositories and the final step (pull request) differ.
+
+ 1. Create a fork of the lieutenant's repository on !GitHub by clicking ''fork'' at e.g. http://github.com/LIEUTENANT_NICK_HERE/django/tree/master (the URL may differ, obviously, LIEUTENANT_NICK_HERE is just a placeholder).
+ 1. Pick a task from the lieutenant's !GitHub project wiki, update the wiki as needed.
+ 1. Clone the fork to your workstation:
+ {{{
+git clone git@github.com:YOUR_NICK_HERE/django.git
+ }}}
+ 1. Add the upstream lieutenant's repository for tracking:
+ {{{
+cd django
+git remote add upstream git://github.com/LIEUTENANT_NICK_HERE/django.git
+git fetch upstream
+ }}}
+ 1. Work on code, commit locally as needed:
+ {{{
+git commit -a -m "Implemented foo."
+ }}}
+ 1. Publish changes to your public repository:
+ {{{
+git push
+ }}}
+ 1. When the upstream lieutenant's repository is updated, pull the updates from it: 
+ {{{
+git pull upstream master
+ }}}
+ 1. When the feature is ready, send the lieutenant a pull request by clicking ''pull request'' on your forked project's page.