Changes between Version 5 and Version 6 of GitInfo

Timestamp:

01/31/12 09:42:46 (12 years ago)

Author:

admin

Comment:

--

GitInfo

@@ -3 +3 @@
 == samle client session ==
 
-get git repository from private repository gittest from server, add a file
+get git repository from private repository gittest on server, add a file afterwards
 {{{
 >git clone https://admin@svn.version.fz-juelich.de/gittest
@@ -28 +28 @@
  * [new branch]      master -> master
 
-changed gittestBlessed 
-changed gittest 
+}}}
+(modify and push the same file on gittest and gittestBlessed on server)
 
+integrate changes from gittest
+{{{
 > git pull
 remote: Counting objects: 5, done.
@@ -41 +43 @@
  testclient.txt |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
-
+}}}
+try to push to gittestBlessed, resolve conflict
+{{{
 git push https://admin@svn.version.fz-juelich.de/gittestBlessed master
 To https://admin@svn.version.fz-juelich.de/gittestBlessed