Changes between Version 4 and Version 5 of CollaborateOnGithub


Ignore:
Timestamp:
01/17/2009 07:32:08 AM (7 years ago)
Author:
mrts
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • CollaborateOnGithub

    v4 v5  
    3737The process should be managed with the '''Dictator and Lieutenants Workflow''', described at http://whygitisbetterthanx.com/#any-workflow.
    3838 * ''Dictators'' are core Django developers, who eventually merge the `git` branches back to Django trunk.
    39  * ''Lieutenants'' are developers, who take the responsibility to steer and coordinate the work on a large feature (e.g. aggregates).
     39 * ''Lieutenants'' are developers, who take the responsibility of steering and coordinating the work on a large feature (e.g. aggregates).
    4040 * ''Contributors'' are developers who contribute -- under lieutenant's guidance -- to the development of the feature.
    4141
     
    5454git fetch upstream
    5555 }}}
     56 1. Work on code, commit locally as needed:
     57 {{{
     58git commit -a -m "Implemented foo."
     59 }}}
     60 1. Publish changes to your public repository:
     61 {{{
     62git push
     63 }}}
     64 1. When the upstream Django SVN mirror is updated, pull the updates from it (fetching and merging in one step):
     65 {{{
     66git pull upstream master
     67 }}}
    5668
    5769=== Contributor ===
Back to Top