Skip to Content

Changes for page Getting Started with Git

Last modified by Bastian Triller on 2013/05/21 17:24
From version 150.1
edited by Kieran Kelleher
on 2011/03/21 16:00
Change comment: There is no comment for this version
To version 151.1
edited by Kieran Kelleher
on 2011/03/21 15:58
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -51,22 +51,19 @@
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 -{{code title="Anatomony of an svn update operation on a git-managed svn working copy"}}
54 +{{info title="Anatomony of an svn update operation on a git-managed svn working copy"}}
55 55  
56 -
56 +{code}
57 57  # Assume you are currently on a working branch. Verify this and check for uncommitted changes.
58 58  git status
59 59  
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 +# Either commit your local changes to your working branch using {{git add}} + {{git commit}}, or temporarily stash them using {{git stash}}
63 63  git stash
64 64  
65 65  # Switch to master branch
66 66  git checkout master
67 67  
68 -# Ensure there are no changes either from an svn perspective
69 -# or a git perspective on the master branch.
66 +# Ensure there are no changes either from an svn perspective or a git perspective on the master branch.
70 70  git status
71 71  svn status
72 72  
... ... @@ -91,5 +91,6 @@
91 91  # Now if you stashed uncommitted changes earlier, you can pop them back into
92 92  # the working copy
93 93  git stash pop
91 +{code}
94 94  
95 -{{/code}}
93 +{{/info}}