Changes between Version 1 and Version 2 of RepositoryGuidelines

Timestamp:

Feb 26, 2010, 12:06:44 PM (15 years ago)

Author:

FrederikHeber

Comment:

Completed exchange between user

RepositoryGuidelines

@@ -1 @@
-=== How to use the Repository on Jupiter ===
+= How to use the Repository on Jupiter =
 
 In this page we describe how to get access, the first thing you have to do (clone the repository) and how one should usually proceed to exchange new versions.
@@ -37 +37 @@
 Parts of the code that have been implemented and tested successfully have to be broadcast to others. There are two ways to do this.
 
-= ... between users =
+=== ... between users ===
 
 This is easy if your computers reside in the same network (i.e. wiss-stud), just tell your colleague that he should pull one of your branches as this
@@ -50 +50 @@
 git remote add <friend> ssh://.../
 }}}
+  2. Use the remote to fetch all remote branches.
+{{{
+git fetch <friend>
+}}}
+  3. Merge the obtained remote branch ''<remotebranch>'' with one of yours, here called ''<yours>''.
+{{{
+git checkout <yours>
+git merge <remotebranch>
+}}}
+Note that ''git pull'' performs the fetch and the merge in a single step.
 
-= ... with the jupiter repository =
+=== ... with the jupiter repository ===
 
-Here, you tell the repository administrator that he should pull one of your branches in the same manner as above. He will check your code and if it is fine, push it onto the jupiter repository. '''Note that you should never ever push yourself branches thereto!''' (except of course you are the administrator :).
+Here, you tell the repository administrator that he should pull one of your branches in the same manner as above. He will check your code and if it is fine, push it onto the jupiter repository. '''Note that you should never ever push branches by yourself thereto! ''' (except of course you are the administrator :).