Changes between Version 4 and Version 5 of CollaborateOnGithub

Timestamp:

Jan 17, 2009, 7:32:08 AM (16 years ago)

Author:

mrts

Comment:

--

CollaborateOnGithub

@@ -37 +37 @@
 The process should be managed with the '''Dictator and Lieutenants Workflow''', described at http://whygitisbetterthanx.com/#any-workflow.
  * ''Dictators'' are core Django developers, who eventually merge the `git` branches back to Django trunk.
- * ''Lieutenants'' are developers, who take the responsibility to steer and coordinate the work on a large feature (e.g. aggregates).
+ * ''Lieutenants'' are developers, who take the responsibility of steering and coordinating the work on a large feature (e.g. aggregates).
  * ''Contributors'' are developers who contribute -- under lieutenant's guidance -- to the development of the feature.
 
@@ -54 +54 @@
 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 Django SVN mirror is updated, pull the updates from it (fetching and merging in one step): 
+ {{{
+git pull upstream master
+ }}}
 
 === Contributor ===