Skip to Content

Changes for page Getting Started with Git

Last modified by Bastian Triller on 2013/05/21 17:24
From version 142.1
edited by Kieran Kelleher
on 2011/03/21 18:51
Change comment: There is no comment for this version
To version 143.1
edited by Kieran Kelleher
on 2011/03/22 01:44
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -57,7 +57,7 @@
57 57  * Switch to master branch before synchronizing with remote svn repo.
58 58  * 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.
59 59  
60 -{{code title="Anatomony of an svn update operation on a git-managed svn working copy"}}
60 +{{code title="Mechanics of an svn update operation on a git-managed svn working copy"}}
61 61  
62 62  
63 63  # Assume you are currently on a working branch. Verify this and check for uncommitted changes.
... ... @@ -99,3 +99,20 @@
99 99  git stash pop
100 100  
101 101  {{/code}}
102 +
103 +{{code title="Mechanics of an svn commit operation from a git-managed svn working copy"}}
104 +
105 +# First perform an svn update as outlined above in the previous section
106 +
107 +# Switch to the master branch
108 +git checkout master
109 +
110 +# Merge your working branch with the master
111 +git merge workingbranch
112 +
113 +# Use svn status, svn add and svn commit to commit your changes to the remote svn repository
114 +
115 +# Switch back to your workingbranch and get back to work.
116 +
117 +
118 +{{/code}}