Skip to Content

Changes for page Getting Started with Git

Last modified by Bastian Triller on 2013/05/21 17:24
From version 140.1
edited by Kieran Kelleher
on 2011/03/22 01:36
Change comment: There is no comment for this version
To version 138.1
edited by Kieran Kelleher
on 2011/03/22 01:42
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -104,6 +104,13 @@
104 104  
105 105  # First perform an svn update as outlined above in the previous section
106 106  
107 +# Switch to the master branch
108 +git checkout master
107 107  
110 +# Merge your working branch with the master
111 +git merge workingbranch
108 108  
113 +# Use svn status, svn add and svn commit to commit your changes to the remote svn repository
114 +
115 +
109 109  {{/code}}