Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>When it comes to collaborating on GitHub, there are two policies:</p> <p>1/ <a href="http://help.github.com/forking/" rel="nofollow noreferrer"><strong>Forking</strong></a></p> <p>This is the recommended path.<br> Basically, your colleague:</p> <ul> <li>clone your repo (called <em>upstream</em>) into his repo (on GitHub, called <em>origin</em>), </li> <li>clone his GitHub repo (<em>origin</em>) on his desktop (<em>local</em>), </li> <li>and do whatever he want between his <em>local</em> repo and his GitHub repo <em>origin</em>.</li> </ul> <p>He will only push to <em>origin</em> because he is not allowed to push on <em>upstream</em> (the ssh-based authentication would fail on your <em>upstream</em> repo)</p> <p>Whenever he wants you to integrate in your GitHub repo some changes, he will make "<strong><a href="http://github.com/guides/pull-requests" rel="nofollow noreferrer">pull request</a></strong>" (through his GitHub repo admin UI), notifying you of some commits to apply.<br> See <a href="http://gist.github.com/64519" rel="nofollow noreferrer">this script</a> by <a href="http://earthcode.com/blog/2009/02/merge_a_github_pull_request_wo.html" rel="nofollow noreferrer">Andre</a> for automating the process.</p> <p>2/ <a href="http://help.github.com/msysgit-key-setup/" rel="nofollow noreferrer"><strong>Granting commit access</strong></a></p> <p>That is a less safe route, where you add his public ssh-key to the list of users/keys allowed to push directly to your upstream repo.<br> See "<strong><a href="http://github.com/guides/managing-collaborators" rel="nofollow noreferrer">Managing Collaborators</a></strong>".</p>
    singulars
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. This table or related slice is empty.
    2. VO
      singulars
      1. This table or related slice is empty.
    3. VO
      singulars
      1. This table or related slice is empty.
    1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload