adding new version control resource

mattmakai · mattmakai · commit 16d1996785f0 · 2014-05-12T07:58:52.000-04:00
diff --git a/feeds/all.atom.xml b/feeds/all.atom.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-05-11T20:15:47Z</updated></feed>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-05-12T07:58:44Z</updated></feed>
diff --git a/source-control.html b/source-control.html
@@ -114,6 +114,11 @@ <h2>Source control resources</h2>
 reviews the basics of distributed version control systems.</p>
 </li>
 <li>
+<p><a href="http://blog.endpoint.com/2014/05/git-workflows-that-work.html">Git Workflows That Work</a>
+  is a helpful post with diagrams to show how teams can create a Git workflow
+  that will help their development process.</p>
+</li>
+<li>
 <p>"<a href="http://www.braintreepaymentsolutions.com/devblog/our-git-workflow">Our Git Workflow</a>"
   by Braintree goes over how this payments company uses Git for development
   and merging source code.</p>
diff --git a/source/content/pages/03-deployment/0313-source-control.markdown b/source/content/pages/03-deployment/0313-source-control.markdown
@@ -75,6 +75,10 @@ as Git or Mercurial.
 * [About version control](http://git-scm.com/book/en/Getting-Started-About-Version-Control) 
 reviews the basics of distributed version control systems.
 
+* [Git Workflows That Work](http://blog.endpoint.com/2014/05/git-workflows-that-work.html)
+  is a helpful post with diagrams to show how teams can create a Git workflow
+  that will help their development process.
+
 * "[Our Git Workflow](http://www.braintreepaymentsolutions.com/devblog/our-git-workflow)"
   by Braintree goes over how this payments company uses Git for development
   and merging source code.

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`		`-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-05-11T20:15:47Z</updated></feed>`
	`2`	`+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-05-12T07:58:44Z</updated></feed>`