Skip to content

Commit a7d4b84

Browse files
author
aeoth
committed
added contribution guide (not a blogpost)
1 parent 32c4b08 commit a7d4b84

19 files changed

+184
-11
lines changed

_site/atom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<title>Code52</title>
44
<link href="http://www.Code52.org/"/>
55
<link type="application/atom+xml" rel="self" href="http://www.Code52.org/atom.xml"/>
6-
<updated>2011-12-30T11:18:08+11:00</updated>
6+
<updated>2012-01-07T11:26:51+11:00</updated>
77
<id>http://www.Code52.org/</id>
88
<author>
99
<name>Code52 Team</name>
@@ -15,7 +15,7 @@
1515
<id>http://www.Code52.org//downmarker</id>
1616
<link type="text/html" rel="alternate" href="http://www.Code52.org//downmarker.html"/>
1717
<title>Week 1: Downmarker WPF</title>
18-
<updated>2012-01-02T00:00:00+11:00</updated>
18+
<updated>2012-01-03T00:00:00+11:00</updated>
1919
<author>
2020
<name>Code52 Team</name>
2121
<uri>http://www.Code52.org/</uri>
@@ -95,7 +95,7 @@
9595

9696
&lt;p&gt; Want to discuss your ideas and suggestions? &lt;a href=&quot;http://code52.tenderapp.com&quot;&gt;Share it&lt;/a&gt;&lt;/p&gt;
9797

98-
&lt;p&gt; Want to get in touch? Follow us on &lt;a href=&quot;http://twitter/code_52&quot;&gt;Twitter&lt;/a&gt;!&lt;/p&gt;
98+
&lt;p&gt; Want to get in touch? Follow us on &lt;a href=&quot;http://twitter.com/code_52&quot;&gt;Twitter&lt;/a&gt;!&lt;/p&gt;
9999
</content>
100100
</entry>
101101

_site/contributing.html

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2+
<html xmlns="http://www.w3.org/1999/xhtml">
3+
<head>
4+
<meta content="en-au" http-equiv="Content-Language" />
5+
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
6+
<link href="/rss.xml" type="application/rss+xml" rel="alternate" title="Blog Feed" />
7+
<link href="/atom.xml" type="application/atom+xml" rel="alternate" title="Blog Feed" />
8+
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
9+
<title>Contributing to Code52 projects - code52</title>
10+
<link rel="stylesheet" type="text/css" href="/css/style.css" />
11+
<link rel="shortcut icon" href="/img/favicon.ico" />
12+
</head>
13+
<body>
14+
<div id="container">
15+
<div id="side">
16+
<a href="/" id="homelink" title="home" alt="home"><img src="/img/logo.png" alt="Code 52 - a new coding project every week" /></a>
17+
<div class="section">
18+
<ul>
19+
<li><a href="/about.html">about</a></li>
20+
<li><a href="http://talk.code52.org/">discussion</a></li>
21+
<li><a href="http://twitter.com/code_52">twitter</a></li>
22+
<li><a href="http://jabbr.net/#/rooms/code52">jabbr</a></li>
23+
<li><a href="http://code52.uservoice.com">submit an idea</a></li>
24+
25+
<li><a href="#">past ideas</a></li>
26+
<li><a href="#">wall of champions</a></li>
27+
28+
29+
</ul>
30+
</div>
31+
32+
</div>
33+
<div id="content">
34+
<div class="entry-container">
35+
<div class='entry'>
36+
<h1> Contributing to Code52 projects </h1>
37+
<span class="postdate"> 7 January, 2012
38+
39+
</span>
40+
<h2>How do I contribute?</h2>
41+
42+
<p>For the Code52 projects, we're adopting what is often referred to as "GitHub Flow". This doesn't exclusively apply to GitHub or even Git, but this is the example we're giving.</p>
43+
44+
<blockquote><p>Note, this is different to "Git Flow", and although many of the principles are the same, it's much much simplier.</p></blockquote>
45+
46+
<h3>Step 1: Fork or branch the repo</h3>
47+
48+
<p><img src="img/githubflow_1.png" alt="" /></p>
49+
50+
<p>At the top of every GitHub project is the magical fork button. If you don't have access to the repo, fork it to copy it over to your account. Once you fork it, you have full administrative privledges over your fork, so you can commit away.</p>
51+
52+
<p>If you do have write access to the repo, just skip to step 2.</p>
53+
54+
<p><img src="img/githubflow_2.png" alt="" /></p>
55+
56+
<h3>Step 2: Pick and issue, any issue. Be an issue!</h3>
57+
58+
<p>Normally you'd easily be able to make a fork, branch and commit up changes, but in Code52 projects we're moving very quickly and can quickly pick up people. It's a good idea to 'stake your claim' on a bug or feature to fix up so that two people aren't working on the same thing.</p>
59+
60+
<p><img src="img/githubflow_3.png" alt="" /></p>
61+
62+
<p>Go over to the original projects issue tab, and pick something that you'd like to work on. Don't see it there? Create an issue. If you can, assign the issue to yourself or leave a comment on the issue saying "I'll do this" - it needs to be explicitly stated, as just reporting an issue (be it a bug or feature) doesn't really let people know what you're doing.</p>
63+
64+
<h3>Step 3: Create a branch and make some changes</h3>
65+
66+
<p>Create a somewhat descriptive branch name on <em>your</em> fork, switch to it, make some changes. A descriptive name helps let us know what you are working on. Better yet, if an issue is created you can reference it <em>in your commit notes</em> by having "#IssueNumber" - ie,</p>
67+
68+
<blockquote><p>#1 - I added more awesome in</p></blockquote>
69+
70+
<p>If you do that, GitHub automatically creates a note in the issue tracker that you've referenced the issue, right down to the specific commit!</p>
71+
72+
<p><img src="img/githubflow_4.png" alt="" /></p>
73+
74+
<p>To create branches in git,</p>
75+
76+
<pre><code>git branch MyBranchName
77+
git checkout MyBranchName
78+
</code></pre>
79+
80+
<h3>Step 4: Send a pull request</h3>
81+
82+
<p>It doesn't matter whether you've got full access to a repo or forked and have your own branch - you can pull request from your fork or from your branch back into the <code>master</code> branch. Even if you're the project "owner/maintainer", if there are others on the project, send a pull request and let somebody else accept/review it.</p>
83+
84+
<p>Why a pull request? One, that gives the project maintainer notification that something has been done, and two, GitHub's pull request interface is a fantastic way to do code reviews.</p>
85+
86+
<p>The pull request button is next to the fork button, up the top of a project.</p>
87+
88+
<p><img src="img/githubflow_5.png" alt="" /></p>
89+
90+
<p>Neat so far, right? It gets better. The pull request will notify the project maintainers, and present them with an <em>awesome</em> magical button.</p>
91+
92+
<p><img src="img/githubflow_6.png" alt="" /></p>
93+
94+
<p>Oh sure, there is extra information about the pull request - such as all the commits involved and full discussion capabilities, but at the end of hte day, the auto-merge button makes pull requests and GitHub flow <em>trivial</em> to do.</p>
95+
96+
</div>
97+
</div>
98+
<div id="page-navigation">
99+
<div class="left"> </div>
100+
<div class="right"> </div>
101+
<div class="clear">&nbsp;</div>
102+
</div>
103+
104+
105+
106+
</div>
107+
108+
</div>
109+
</body>
110+
</html>

_site/downmarker.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<div class="entry-container">
3535
<div class='entry'>
3636
<h1> Week 1: Downmarker WPF </h1>
37-
<span class="postdate"> 2 January, 2012
37+
<span class="postdate"> 3 January, 2012
3838

3939
</span>
4040
<p>Our first run out of the gate is a project that a few people have taken a stab at in the past, and will help us blog easier.</p>

_site/img/githubflow_1.png

10.5 KB
Loading

_site/img/githubflow_2.png

6.31 KB
Loading

_site/img/githubflow_3.png

22.7 KB
Loading

_site/img/githubflow_4.png

37.3 KB
Loading

_site/img/githubflow_5.png

42.5 KB
Loading

_site/img/githubflow_6.png

95.9 KB
Loading

_site/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
<h1><a href="/downmarker">Week 1: Downmarker WPF</a></h1>
4040

41-
<div class="postdate"> 2 January, 2012
41+
<div class="postdate"> 3 January, 2012
4242
<ul>
4343

4444
</ul>
@@ -123,7 +123,7 @@ <h2>"What's next?"</h2>
123123

124124
<p> Want to discuss your ideas and suggestions? <a href="http://code52.tenderapp.com">Share it</a></p>
125125

126-
<p> Want to get in touch? Follow us on <a href="http://twitter/code_52">Twitter</a>!</p>
126+
<p> Want to get in touch? Follow us on <a href="http://twitter.com/code_52">Twitter</a>!</p>
127127

128128

129129
<a href="/introduction#disqus_thread">Comments</a>

0 commit comments

Comments
 (0)