Skip to Content

Changes for page Getting Started with Git

Last modified by Bastian Triller on 2013/05/21 17:24
From version 107.1
edited by Kieran Kelleher
on 2011/03/21 15:55
Change comment: There is no comment for this version
To version 102.1
edited by Kieran Kelleher
on 2011/03/21 16:01
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -51,18 +51,22 @@
51 51  * Switch to master branch before synchronizing with remote svn repo.
52 52  * You can use ##git stash## to temporarily put aside your uncommitted changes before doing an svn update. Then use ##git stash pop## to replay those uncommitted changes onto the working copy.
53 53  
54 -{{info value="Anatomony of an svn update operation on a git-managed svn working copy"}}
54 +{{code title="Anatomony of an svn update operation on a git-managed svn working copy"}}
55 55  
56 +
56 56  # Assume you are currently on a working branch. Verify this and check for uncommitted changes.
57 57  git status
58 58  
59 -# Either commit your local changes to your working branch using {{git add}} + {{git commit}}, or temporarily stash them using {{git stash}}
60 +# Either commit your local changes to your working branch
61 +# using 'git add' + 'git commit', or temporarily stash
62 +# them using 'git stash'
60 60  git stash
61 61  
62 62  # Switch to master branch
63 63  git checkout master
64 64  
65 -# Ensure there are no changes either from an svn perspective or a git perspective on the master branch.
68 +# Ensure there are no changes either from an svn perspective
69 +# or a git perspective on the master branch.
66 66  git status
67 67  svn status
68 68  
... ... @@ -88,4 +88,4 @@
88 88  # the working copy
89 89  git stash pop
90 90  
91 -{{/info}}
95 +{{/code}}