Changes between Version 1 and Version 2 of WorkingWithGithub


Ignore:
Timestamp:
07/01/15 10:12:52 (6 years ago)
Author:
jdreed
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • WorkingWithGithub

    v1 v2  
    33We rely heavily on Github for our workflow, because it makes code review easier and provides an easily viewable history of changes, pull requests, etc. 
    44 
    5 *NOTE*: As of this writing (July 2015), we only use "regular" Github (github.com).  The project does *not* make use of MIT's `github.mit.edu` service, with the single exception of adding a remote for the moira repository to fetch changes from.  (described elsewhere) 
     5**NOTE**: As of this writing (July 2015), we only use "regular" Github (github.com).  The project does *not* make use of MIT's `github.mit.edu` service, with the single exception of adding a remote for the moira repository to fetch changes from.  (described elsewhere) 
    66 
    77If you don't have a Github account, go create one now.  The rest of this document assumes that you have a Github account, and can authenticate to it from your Git client, whether using SSH keys, passwords over SSL/webdav, or some other means. 
     
    3030Then, visit you fork on Github's website, and submit a Pull Request from your branch.  If your pull request contains multiple commits, write a summary of it in the field provided.  If it only contains a single commit, it will be pre-populated from the commit message. 
    3131 
    32 That will take you to a URL like this: `https://github.com/mit-athena/getcluster/pull/1`  (*SEE IMPORTANT WARNING BELOW *) 
     32That will take you to a URL like this: `https://github.com/mit-athena/getcluster/pull/1`  (**SEE IMPORTANT WARNING BELOW **) 
    3333 
    3434You can comment on others' pull requests, and they will comment on yours.  When the pull request receives one more "+1"s, you can return to your checkout of the source tree, and push your changes to `origin`, as described in [wiki:CommittingYourChanges this page]. 
    3535 
    36 === WARNING === 
     36== WARNING == 
    3737 
    38 *WARNING*: NEVER, EVER, EVER, EVER click the big green "Merge" button on a Pull Request page on Github.  That will cause our synchronization scripts to break. 
     38**WARNING**: NEVER, EVER, EVER, EVER click the big green "Merge" button on a Pull Request page on Github.  That will cause our synchronization scripts to break. 
    3939