ticean · January 3, 2012 21:14 · Jan 4, 2012 · Jan 4, 2012 · Jan 4, 2012 · Jan 3, 2012
diff --git a/SVN_Git_Mirror.md b/SVN_Git_Mirror.md
@@ -82,11 +82,10 @@ The basic procedure looks like this:
 ```sh
 git checkout develop     // Switch to develop branch
 get svn rebase           // Get latest stuff from SVN repository
-git push origin develop  // Send code to Github repository
 
 # Push changes to git remote
 # git push <repository> <branch>
-git push origin develop
+git push origin develop  // Send code to Github repository
 ```
 
 ### Merging

diff --git a/SVN_Git_Mirror.md b/SVN_Git_Mirror.md
@@ -3,7 +3,7 @@ Create Git Mirror from SVN Repository
 
 This guide will demonstrate how to mirror an SVN into a Git repo. You're the target audience if you're an SVN user, just getting started with Git and need to coax your project team over to Git. 
 
-*The scenario has been simplified for clarity. I don't know anybody that just has dev and prod branches.*
+*The branching scenario has been simplified for clarity.*
 
 
 References
@@ -50,6 +50,7 @@ git reset --hard production
 ```
 
 If you'd like to see how your branches are organized you can view all branches
+
 ```sh
 # Show current branches
 git branch -va
@@ -63,7 +64,8 @@ Now we have Git branches properly mapped to SVN branches. But, so far there's on
 You can use an existing Git repository, or create a new one. In either case, you'll need the remote Git URL to add the remote. You can name the remote anything you'd like, but the default remote name is 'origin'.
 
 
-```sh Adding a Git remote:
+```sh 
+# Add a Git remote
 git remote add origin git@github.com:guidance/emergencylink.git
 ```
 
@@ -76,6 +78,7 @@ Once things are configured, it's a matter of keeping the git mirror up to date.
 The basic procedure looks like this:
 
 ### Get Latest Code from SVN
+
 ```sh
 git checkout develop     // Switch to develop branch
 get svn rebase           // Get latest stuff from SVN repository

diff --git a/SVN_Git_Mirror.md b/SVN_Git_Mirror.md
@@ -1,17 +1,30 @@
-Bridging SVN & Git
-====================
+Create Git Mirror from SVN Repository
+==========================================
+
+This guide will demonstrate how to mirror an SVN into a Git repo. You're the target audience if you're an SVN user, just getting started with Git and need to coax your project team over to Git. 
+
+*The scenario has been simplified for clarity. I don't know anybody that just has dev and prod branches.*
 
-This guide will demonstrate how to mirror SVN commits over to GIT.
-Work in progress... 
 
 References
 -----------
 
-First off, I'll give some credits. I've lifed all this information from various placed on the web.
+First off, I'll give some credits. I've lifted all this information from various placed on the web. You should probably follow these links for better instruction. :)
 
 * http://help.github.com/mac-set-up-git
 * http://swik.net/Rails/Robby+on+Rails/git-svn+is+a+gateway+drug/cboew
 
+Prerequisites
+----------------
+We'll start assuming that you
+
+* Have installed Git
+* Have an SVN repo with standard layout (trunk, branches, tags)
+* Can type into a terminal
+
+We'll also assume that SVN *trunk* is your integration branch, and that SVN *branches/production* contains the production code.
+
+
 
 Creating the Local Git Repository
 -----------------------------------
@@ -36,12 +49,54 @@ git reset --hard production
 
 ```
 
+If you'd like to see how your branches are organized you can view all branches
+```sh
+# Show current branches
+git branch -va
+```
+
 Adding a Git remote
 ---------------------
-Now we have Git branches properly mapped to SVN branches. But, our only remote is the SVN repostory.
 
-Either use an existing Git repository, or create a new one. You will need the remote Git URL to add the remote.
+Now we have Git branches properly mapped to SVN branches. But, so far there's only a relationship with the SVN repository. We need to create another relationship to the Git repo.
 
-```sh
+You can use an existing Git repository, or create a new one. In either case, you'll need the remote Git URL to add the remote. You can name the remote anything you'd like, but the default remote name is 'origin'.
+
+
+```sh Adding a Git remote:
 git remote add origin git@github.com:guidance/emergencylink.git
 ```
+
+
+Keeping Up to Date
+---------------------
+
+Once things are configured, it's a matter of keeping the git mirror up to date.
+
+The basic procedure looks like this:
+
+### Get Latest Code from SVN
+```sh
+git checkout develop     // Switch to develop branch
+get svn rebase           // Get latest stuff from SVN repository
+git push origin develop  // Send code to Github repository
+
+# Push changes to git remote
+# git push <repository> <branch>
+git push origin develop
+```
+
+### Merging
+
+At some point you'll want to get your code into production. We'll assume that you're going to use git to merge the whole thing over to master. (This is a much-too-simple worldview, but source control strategy and workflow isn't in scope of this article.)
+
+
+```sh
+# In git, merging pulls code from another branch into the current branch:
+# git merge <branch_to_merge_from>
+
+git checkout master
+git merge develop
+git push origin master
+```
+
diff --git a/SVN_Git_Mirror.md b/SVN_Git_Mirror.md
@@ -13,8 +13,8 @@ First off, I'll give some credits. I've lifed all this information from various
 * http://swik.net/Rails/Robby+on+Rails/git-svn+is+a+gateway+drug/cboew
 
 
-Procedure
-----------
+Creating the Local Git Repository
+-----------------------------------
 
 ```sh
 # Clone an SVN repo with Git
@@ -34,4 +34,14 @@ git checkout master
 # We'll change this to link local 'develop' branch to trunk
 git reset --hard production
 
-```
+```
+
+Adding a Git remote
+---------------------
+Now we have Git branches properly mapped to SVN branches. But, our only remote is the SVN repostory.
+
+Either use an existing Git repository, or create a new one. You will need the remote Git URL to add the remote.
+
+```sh
+git remote add origin git@github.com:guidance/emergencylink.git
+```
diff --git a/SVN_Git_Mirror → SVN_Git_Mirror.md b/SVN_Git_Mirror → SVN_Git_Mirror.md
diff --git a/SVN_Git_Mirror b/SVN_Git_Mirror
@@ -0,0 +1,37 @@
+Bridging SVN & Git
+====================
+
+This guide will demonstrate how to mirror SVN commits over to GIT.
+Work in progress... 
+
+References
+-----------
+
+First off, I'll give some credits. I've lifed all this information from various placed on the web.
+
+* http://help.github.com/mac-set-up-git
+* http://swik.net/Rails/Robby+on+Rails/git-svn+is+a+gateway+drug/cboew
+
+
+Procedure
+----------
+
+```sh
+# Clone an SVN repo with Git
+git svn init -s http://svn.yourdomain.com/repos/project_name
+cd project_name
+
+# Fetch the SVN branches to the local Git repo
+git svn fetch
+
+# Once this is done, you’re local 'master' branch is linked to trunk/.
+# Make a new branch for develop & check it out
+git checkout -b develop 
+
+# Back to master.
+git checkout master
+
+# We'll change this to link local 'develop' branch to trunk
+git reset --hard production
+
+```