Changes for page Getting Started with Git

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -51,19 +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 title="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		-{noformat}
	56	+
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 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}}
61	61	git stash
62	62
63	63	# Switch to master branch
64	64	git checkout master
65	65
66		-# 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.
67	67	git status
68	68	svn status
69	69
...	...	@@ -88,6 +88,5 @@
88	88	# Now if you stashed uncommitted changes earlier, you can pop them back into
89	89	# the working copy
90	90	git stash pop
91		-{noformat}
92	92
93		-{{/info}}
	95	+{{/code}}