Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <pre><code>git clone git://yourrepo.com/project.git </code></pre> <p>Create a tracked remote branch. This means that pulls and push operations are automatically done with the main branch. The track branch might be origin/dev or origin/master. Whichever.</p> <pre><code>git checkout --track -b mylocalbranch origin/trackedbranch </code></pre> <p>After that a normal git work flow is done with local commits and such. Occasionally he should,</p> <pre><code>git pull --rebase </code></pre> <p>This will perform a rebase operation which rolls back his changes, pulls in the changes made to the remote branch, then replays his local changes on top of that (resolve any conflicts; perform any merges).</p> <p>When he's done and wants to make those changes live, he should bring things current:</p> <pre><code>git pull --rebase # get most recent changes </code></pre> <p>Then, for a bare repository:</p> <pre><code>git push # push his changes to the main repo </code></pre> <p>If it's a non-bare repository (like your repository in your home folder or some such), then it's preferred that he notify you that he's ready and then <em>you</em> do the</p> <pre><code>git pull /path/to/his/repo </code></pre> <p>It's generally advised not to push to non-bare repositories. The reason being you could have uncommitted changes in your local and when he pushes to it, chaos can ensue <a href="http://www.gitready.com/advanced/2009/02/01/push-to-only-bare-repositories.html" rel="nofollow noreferrer">details</a>. Kernel trap thread discussing this <a href="http://kerneltrap.org/mailarchive/git/2007/3/18/241553" rel="nofollow noreferrer">pit fall</a></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.
 

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