Skip to content

Commit 9ae247c

Browse files
mattmakaimattmakai
committed
adding new resources for source control
1 parent 41bb3d6 commit 9ae247c

File tree

3 files changed

+73
-34
lines changed

3 files changed

+73
-34
lines changed

‎feeds/all.atom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?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-04-05T08:25:09Z</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-04-06T09:38:58Z</updated></feed>

‎source-control.html‎

Lines changed: 45 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,30 +87,63 @@ <h2>Why is source control necessary?</h2>
8787
project should immediately begin by using a version control system such
8888
as Git or Mercurial.</p>
8989
<h2>Source Control Systems</h2>
90+
<ul>
91+
<li>
9092
<p><a href="http://git-scm.com/">Git</a> is a free and open source distributed version
91-
control system.</p>
93+
control system.</p>
94+
</li>
95+
<li>
9296
<p><a href="http://mercurial.selenic.com/">Mercurial</a> is similar to Git, also a free
93-
and open source distributed version control system.</p>
97+
and open source distributed version control system.</p>
98+
</li>
99+
</ul>
94100
<h2>Source Control Third Party Services</h2>
101+
<ul>
102+
<li>
95103
<p><a href="https://github.com/">GitHub</a> is currently the most commonly used source
96-
control platform for using Git.</p>
104+
control platform for using Git.</p>
105+
</li>
106+
<li>
97107
<p><a href="https://bitbucket.org/">BitBucket</a> provides free Git and Mercurial
98-
repositories for open projects and private repositories for up to five
99-
users. Users pay for hosting private repositories with more than five users.</p>
108+
repositories for open projects and private repositories for up to five
109+
users. Users pay for hosting private repositories with more than five users.</p>
110+
</li>
111+
</ul>
100112
<h2>Source Control Resources</h2>
101-
<p><a href="http://www.kalzumeus.com/2010/12/12/staging-servers-source-control-deploy-workflows-and-other-stuff-nobody-teaches-you/">Staging Servers, Source Control &amp; Deploy Workflows, And Other Stuff Nobody Teaches You</a> by Patrick McKenzie.</p>
113+
<ul>
114+
<li>
115+
<p><a href="http://www.kalzumeus.com/2010/12/12/staging-servers-source-control-deploy-workflows-and-other-stuff-nobody-teaches-you/">Staging Servers, Source Control &amp; Deploy Workflows, And Other Stuff Nobody Teaches You</a>
116+
is a comprehensive overview by Patrick McKenzie of why you need source
117+
control.</p>
118+
</li>
119+
<li>
102120
<p>This lighthearted guide to the
103-
<a href="http://www.flourish.org/blog/?p=397">ten astonishments in version control history</a>
104-
is a fun way to learn how systems developed over the past several decades.</p>
121+
<a href="http://www.flourish.org/blog/?p=397">ten astonishments in version control history</a>
122+
is a fun way to learn how systems developed over the past several decades.</p>
123+
</li>
124+
<li>
105125
<p><a href="http://betterexplained.com/articles/a-visual-guide-to-version-control/">A visual guide to version control</a>
106-
is a detailed article with real-life examples for why version control is
107-
necessary in software development.</p>
126+
is a detailed article with real-life examples for why version control is
127+
necessary in software development.</p>
128+
</li>
129+
<li>
108130
<p><a href="http://guides.beanstalkapp.com/version-control/intro-to-version-control.html">An introduction to version control</a>
109-
shows the basic concepts behind version control systems.</p>
131+
shows the basic concepts behind version control systems.</p>
132+
</li>
133+
<li>
110134
<p><a href="http://oss-watch.ac.uk/resources/versioncontrol">What Is Version Control? Why Is It Important For Due Diligence?</a>
111-
explains the benefits and necessity of version control systems.</p>
135+
explains the benefits and necessity of version control systems.</p>
136+
</li>
137+
<li>
112138
<p><a href="http://git-scm.com/book/en/Getting-Started-About-Version-Control">About version control</a>
113139
reviews the basics of distributed version control systems.</p>
140+
</li>
141+
<li>
142+
<p>"<a href="http://www.braintreepaymentsolutions.com/devblog/our-git-workflow">Our Git Workflow</a>"
143+
by Braintree goes over how this payments company uses Git for development
144+
and merging source code.</p>
145+
</li>
146+
</ul>
114147
<br/>
115148
Next read the
116149
<a href="/caching.html">caching</a> section.

‎source/content/pages/13-source-control/1301-source-control.markdown‎

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,39 +22,45 @@ as Git or Mercurial.
2222

2323

2424
## Source Control Systems
25-
[Git](http://git-scm.com/) is a free and open source distributed version
26-
control system.
25+
* [Git](http://git-scm.com/) is a free and open source distributed version
26+
control system.
2727

28-
[Mercurial](http://mercurial.selenic.com/) is similar to Git, also a free
29-
and open source distributed version control system.
28+
* [Mercurial](http://mercurial.selenic.com/) is similar to Git, also a free
29+
and open source distributed version control system.
3030

3131

3232
## Source Control Third Party Services
33-
[GitHub](https://github.com/) is currently the most commonly used source
34-
control platform for using Git.
33+
* [GitHub](https://github.com/) is currently the most commonly used source
34+
control platform for using Git.
3535

36-
[BitBucket](https://bitbucket.org/) provides free Git and Mercurial
37-
repositories for open projects and private repositories for up to five
38-
users. Users pay for hosting private repositories with more than five users.
36+
* [BitBucket](https://bitbucket.org/) provides free Git and Mercurial
37+
repositories for open projects and private repositories for up to five
38+
users. Users pay for hosting private repositories with more than five users.
3939

4040

4141
## Source Control Resources
42-
[Staging Servers, Source Control & Deploy Workflows, And Other Stuff Nobody Teaches You](http://www.kalzumeus.com/2010/12/12/staging-servers-source-control-deploy-workflows-and-other-stuff-nobody-teaches-you/) by Patrick McKenzie.
42+
* [Staging Servers, Source Control & Deploy Workflows, And Other Stuff Nobody Teaches You](http://www.kalzumeus.com/2010/12/12/staging-servers-source-control-deploy-workflows-and-other-stuff-nobody-teaches-you/)
43+
is a comprehensive overview by Patrick McKenzie of why you need source
44+
control.
4345

44-
This lighthearted guide to the
45-
[ten astonishments in version control history](http://www.flourish.org/blog/?p=397)
46-
is a fun way to learn how systems developed over the past several decades.
46+
* This lighthearted guide to the
47+
[ten astonishments in version control history](http://www.flourish.org/blog/?p=397)
48+
is a fun way to learn how systems developed over the past several decades.
4749

48-
[A visual guide to version control](http://betterexplained.com/articles/a-visual-guide-to-version-control/)
49-
is a detailed article with real-life examples for why version control is
50-
necessary in software development.
50+
* [A visual guide to version control](http://betterexplained.com/articles/a-visual-guide-to-version-control/)
51+
is a detailed article with real-life examples for why version control is
52+
necessary in software development.
5153

52-
[An introduction to version control](http://guides.beanstalkapp.com/version-control/intro-to-version-control.html)
53-
shows the basic concepts behind version control systems.
54+
* [An introduction to version control](http://guides.beanstalkapp.com/version-control/intro-to-version-control.html)
55+
shows the basic concepts behind version control systems.
5456

55-
[What Is Version Control? Why Is It Important For Due Diligence?](http://oss-watch.ac.uk/resources/versioncontrol)
56-
explains the benefits and necessity of version control systems.
57+
* [What Is Version Control? Why Is It Important For Due Diligence?](http://oss-watch.ac.uk/resources/versioncontrol)
58+
explains the benefits and necessity of version control systems.
5759

58-
[About version control](http://git-scm.com/book/en/Getting-Started-About-Version-Control)
60+
* [About version control](http://git-scm.com/book/en/Getting-Started-About-Version-Control)
5961
reviews the basics of distributed version control systems.
6062

63+
* "[Our Git Workflow](http://www.braintreepaymentsolutions.com/devblog/our-git-workflow)"
64+
by Braintree goes over how this payments company uses Git for development
65+
and merging source code.
66+

0 commit comments

Comments
 (0)