User:Timothee Flutre/Notebook/Postdoc/2012/08/14: Difference between revisions
From OpenWetWare
(→About Git: add links and help) |
m (→About Git) |
||
Line 26: | Line 26: | ||
** I push the changes I made from my local repo onto github: <code>git push origin master</code>, this for each branch I created. | ** I push the changes I made from my local repo onto github: <code>git push origin master</code>, this for each branch I created. | ||
** I send an email to my colleagues telling them that they can retrieve the content of the repository from github into their local machine(s): <code>git clone https://github.com/timflutre/paper.git</code>. | ** I send an email to my colleagues telling them that they can retrieve the content of the repository from github into their local machine(s): <code>git clone https://github.com/timflutre/paper.git</code>. | ||
** Each of us can make modifications on its own branch, and push them on github in order to allow the others to access the changes. | ** Each of us can make modifications on its own branch, and push them on github in order to allow the others to access the changes: <code>git push origin colleague1</code> for instance. | ||
** From time to time, one of us has the responsibility to merge the changes and update the "master" branch with the latest version. | ** From time to time, one of us has the responsibility to merge the changes and update the "master" branch with the latest version. | ||
** Once this is done, the others need to retrieve the new content of "master" in their local repo: <code>git checkout master</code>, <code>git fetch origin</code>, <code>git diff master origin/master</code>, <code>git merge origin/master</code>. | ** Once this is done, the others need to retrieve the new content of "master" in their local repo: <code>git checkout master</code>, <code>git fetch origin</code>, <code>git diff master origin/master</code>, <code>git merge origin/master</code>. |
Revision as of 12:58, 15 August 2012
Project name | <html><img src="/images/9/94/Report.png" border="0" /></html> Main project page <html><img src="/images/c/c3/Resultset_previous.png" border="0" /></html>Previous entry<html> </html>Next entry<html><img src="/images/5/5c/Resultset_next.png" border="0" /></html> |
About Git
|