Code

Changes between Version 6 and Version 7 of CollaborateOnGithub


Ignore:
Timestamp:
01/17/09 05:50:42 (5 years ago)
Author:
mrts
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • CollaborateOnGithub

    v6 v7  
    4343 
    4444 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 
    45  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. 
     45 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. 
    4646 1. Clone the fork to your workstation: 
    4747 {{{ 
     
    6666git pull upstream master 
    6767 }}} 
    68  1. When the feature is ready, get in contact with a core developer to integrate your work. 
     68 1. When the feature is ready, get in contact with a core developer (the ''dictator'') to integrate your work. 
    6969 
    7070==== Managing contributor submissions ==== 
    7171 
    72 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). 
    73   
     72When 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). 
     73 
    7474When a lieutenant receives a pull request:  
     75 1. Review the diff with !GitHub web tools 
    7576 
    7677=== Contributor === 
     78 
     79Largely, this is a copy-paste of the lieutenant workflow, only the tracked repositories and the final step (pull request) differ. 
     80 
     81 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). 
     82 1. Pick a task from the lieutenant's !GitHub project wiki, update the wiki as needed. 
     83 1. Clone the fork to your workstation: 
     84 {{{ 
     85git clone git@github.com:YOUR_NICK_HERE/django.git 
     86 }}} 
     87 1. Add the upstream lieutenant's repository for tracking: 
     88 {{{ 
     89cd django 
     90git remote add upstream git://github.com/LIEUTENANT_NICK_HERE/django.git 
     91git fetch upstream 
     92 }}} 
     93 1. Work on code, commit locally as needed: 
     94 {{{ 
     95git commit -a -m "Implemented foo." 
     96 }}} 
     97 1. Publish changes to your public repository: 
     98 {{{ 
     99git push 
     100 }}} 
     101 1. When the upstream lieutenant's repository is updated, pull the updates from it:  
     102 {{{ 
     103git pull upstream master 
     104 }}} 
     105 1. When the feature is ready, send the lieutenant a pull request by clicking ''pull request'' on your forked project's page.