cfarm · August 29, 2015 14:03 · Jul 15, 2015 · Jul 11, 2014 · Jul 11, 2014 · Jul 11, 2014
diff --git a/github-flow.md b/github-flow.md
@@ -32,6 +32,16 @@
 
   1. `git checkout production`
   2. `git merge master`
+  3. 
+
+## TL;DR
+
+1. `git checkout master`
+1. `git branch my-new-branch`
+1. `git checkout my-new-branch`
+1. `git add filename`
+1. `git commit -m "i edited a file"`
+1. `git push origin my-new-branch`
 
 ## BONUS: TAGS
 You can create tags in Git and push them to Github to make specific 'releases' for a delivery. This freezes the codebase at that point in time at a url using that tagname.

diff --git a/github-flow.md b/github-flow.md
@@ -36,7 +36,7 @@
 ## BONUS: TAGS
 You can create tags in Git and push them to Github to make specific 'releases' for a delivery. This freezes the codebase at that point in time at a url using that tagname.
 
-1. Create a tag
+1. Create a tag called batch1-templates
 
   `git tag batch1-templates`
 

diff --git a/github-flow.md b/github-flow.md
@@ -1,3 +1,5 @@
+## Workflow for Git and Github
+
 1. Create a new branch from master:
 
   1. `git checkout master` or `git status` to confirm you're working on master

diff --git a/github-flow.md b/github-flow.md
@@ -29,4 +29,17 @@
 7. Once your Pull Request is approved and merged to master, you'll need to take an additional step to deploy it to the Client site by merging it to the `production` branch.
 
   1. `git checkout production`
-  2. `git merge master`
+  2. `git merge master`
+
+## BONUS: TAGS
+You can create tags in Git and push them to Github to make specific 'releases' for a delivery. This freezes the codebase at that point in time at a url using that tagname.
+
+1. Create a tag
+
+  `git tag batch1-templates`
+
+2. Push to Github!
+
+  `git push --tags`
+
+3. Check the Github 'Releases' tab for your repo to see all tags.
diff --git a/github-flow.md b/github-flow.md
@@ -17,7 +17,7 @@
 
   This will create the branch on Github.
 
-5. When you're ready for the branch to be reviewed, it's PULL REQUEST TIME. Go to the repository and click the BIG GREEN BUTTON
+5. When you're ready for the branch to be reviewed, it's PULL REQUEST TIME. Go to the repository and click the BIG GREEN BUTTON. You can see the site build by clicking the Deployment "Details" link on the bottom of the PR page.
 
 6. IF you can't merge through Github then you need to do it manually. Commands:
 

diff --git a/github-flow.md b/github-flow.md
@@ -1,10 +1,8 @@
 1. Create a new branch from master:
 
-  `git checkout master`
+  1. `git checkout master` or `git status` to confirm you're working on master
+  2. `git branch my-new-branch`
 
-or git status to confirm you're on master
-
-  `git branch my-new-branch`
 2. Check out the new branch!!!
 
   `git checkout my-new-branch`

diff --git a/github-flow.md b/github-flow.md
@@ -1,17 +1,23 @@
-1. Create a new branch from Master
+1. Create a new branch from master:
+
   `git checkout master`
+
 or git status to confirm you're on master
+
   `git branch my-new-branch`
 2. Check out the new branch!!!
+
   `git checkout my-new-branch`
 
 3. Make commits on this branch
   1. `git add filename`
   2. `git commit -m "i edited a file"`
 
-4. Push commits to remote repository (Github)
-`git push origin my-new-branch`
-This will create the branch on Github.
+4. Push commits to remote repository (Github):
+
+  `git push origin my-new-branch`
+
+  This will create the branch on Github.
 
 5. When you're ready for the branch to be reviewed, it's PULL REQUEST TIME. Go to the repository and click the BIG GREEN BUTTON
 

diff --git a/github-flow.md b/github-flow.md
@@ -1,26 +1,26 @@
 1. Create a new branch from Master
-`git checkout master`
+  `git checkout master`
 or git status to confirm you're on master
-`git branch my-new-branch`
+  `git branch my-new-branch`
 2. Check out the new branch!!!
-`git checkout my-new-branch`
+  `git checkout my-new-branch`
 
 3. Make commits on this branch
-`git add filename`
-`git commit -m "i edited a file"`
+  1. `git add filename`
+  2. `git commit -m "i edited a file"`
 
 4. Push commits to remote repository (Github)
 `git push origin my-new-branch`
 This will create the branch on Github.
 
-5. When you're ready for the branch to be reviewed, it's PULL REQUEST TIME. Github.com Yo.
+5. When you're ready for the branch to be reviewed, it's PULL REQUEST TIME. Go to the repository and click the BIG GREEN BUTTON
 
 6. IF you can't merge through Github then you need to do it manually. Commands:
 
-* `git checkout master`
-* Then make sure you're up to date with `git pull`
-* `git merge my-new-branch`
-* `git push origin master`
+  1. `git checkout master`
+  2. Then make sure you're up to date with `git pull`
+  3. `git merge my-new-branch`
+  4. `git push origin master`
 
 7. Once your Pull Request is approved and merged to master, you'll need to take an additional step to deploy it to the Client site by merging it to the `production` branch.
 

diff --git a/github-flow.md b/github-flow.md
@@ -24,5 +24,5 @@ This will create the branch on Github.
 
 7. Once your Pull Request is approved and merged to master, you'll need to take an additional step to deploy it to the Client site by merging it to the `production` branch.
 
-`git checkout production`
-`git merge master`
+  1. `git checkout production`
+  2. `git merge master`
diff --git a/gistfile1.txt → github-flow.md b/gistfile1.txt → github-flow.md
diff --git a/gistfile1.txt b/gistfile1.txt
@@ -0,0 +1,28 @@
+1. Create a new branch from Master
+`git checkout master`
+or git status to confirm you're on master
+`git branch my-new-branch`
+2. Check out the new branch!!!
+`git checkout my-new-branch`
+
+3. Make commits on this branch
+`git add filename`
+`git commit -m "i edited a file"`
+
+4. Push commits to remote repository (Github)
+`git push origin my-new-branch`
+This will create the branch on Github.
+
+5. When you're ready for the branch to be reviewed, it's PULL REQUEST TIME. Github.com Yo.
+
+6. IF you can't merge through Github then you need to do it manually. Commands:
+
+* `git checkout master`
+* Then make sure you're up to date with `git pull`
+* `git merge my-new-branch`
+* `git push origin master`
+
+7. Once your Pull Request is approved and merged to master, you'll need to take an additional step to deploy it to the Client site by merging it to the `production` branch.
+
+`git checkout production`
+`git merge master`
No results found