-
Notifications
You must be signed in to change notification settings - Fork 31
/
chap1-4.html
196 lines (190 loc) · 11.3 KB
/
chap1-4.html
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>Git In The Trenches</title>
<link href="stylesheet.css" rel="stylesheet" type="text/css">
<link type="text/css" href="menu.css" rel="stylesheet" />
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-228354-4']);
_gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
</head>
<body>
<table width="1000" border="0" align="center" cellpadding="0" cellspacing="0">
<tr>
<td><table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td><table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="logo"><a href="index.html"><img src="images/git_logo_new.png" alt="Git In The Trenches" height="61" border="0"></a></td>
<td class="nav">
<a href="index.html">Home</a> |
<a href="download.html">Download Now</a> |
<a href="intro.html">Read Now</a> |
<a href="http://github.com/cbx33/gitt">Source</a> |
<a href="feedback.html">Feeback</a>
</td>
</tr>
</table></td>
</tr>
<tr>
<td> </td>
</tr>
<tr>
<td class="main_content_pad"><table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td width="309"><table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="subnav">
<strong>Introduction</strong><br>
• <a href="intro.html">How this book works</a><br>
<div class="divider"></div>
<strong>Setting up</strong><br>
• <a href="setup.html">Making sure you have everything</a><br>
<div class="divider"></div>
<strong>Week 1</strong><br>
<span>• Day 1 </span> - <a href="chap1-1.html"> "Things need to change"</a><br>
<span>• Day 3 </span> - <a href="chap1-2.html"> "A possible solution"</a><br>
<span>• Day 4 </span> - <a href="chap1-3.html"> "A decision is reached"</a><br>
<span>• Day 5 </span> - <a href="chap1-4.html"> "Working like a team"</a><br>
<div class="divider"></div>
<strong>After Hours Week 1</strong><br>
• <a href="afterhours1-1.html">"History Lesson"</a><br>
<div class="divider"></div>
<strong>Week 2</strong><br>
<span>• Day 1 </span> - <a href="chap2-1.html"> "We are coders, we use Git!"</a><br>
<span>• Day 2 </span> - <a href="chap2-2.html"> "Making commitments"</a><br>
<span>• Day 4 </span> - <a href="chap2-3.html"> "Let's do this right, not fast"</a><br>
<span>• Summary </span> - <a href="chap2-4.html"> John's Notes</a><br>
<div class="divider"></div>
<strong>After Hours Week 2</strong><br>
• <a href="afterhours2-1.html">"A Little Of Git's Internals"</a><br>
<div class="divider"></div>
<strong>Week 3</strong><br>
<span>• Day 1 </span> - <a href="chap3-1.html"> "How do I see what's going on?"</a><br>
<span>• Day 2 </span> - <a href="chap3-2.html"> "But I need more information"</a><br>
<span>• Day 3 </span> - <a href="chap3-3.html"> "What actually changed?"</a><br>
<span>• Day 4 </span> - <a href="chap3-4.html"> "Finding a good reference point"</a><br>
<span>• Day 5 </span> - <a href="chap3-5.html"> "Putting things back again"</a><br>
<span>• Summary </span> - <a href="chap3-6.html"> John's Notes</a><br>
<div class="divider"></div>
<strong>After Hours Week 3</strong><br>
• <a href="afterhours3-1.html">"A Closer Look At Diffs and Tags"</a><br>
<div class="divider"></div>
<strong>Week 4</strong><br>
<span>• Day 1 </span> - <a href="chap4-1.html"> "We're getting somewhere"</a><br>
<span>• Day 2 </span> - <a href="chap4-2.html"> "Branches galore"</a><br>
<span>• Day 3 </span> - <a href="chap4-3.html"> "Tricking the twigs"</a><br>
<span>• Day 4 </span> - <a href="chap4-4.html"> "I pressed delete..."</a><br>
<span>• Day 5 </span> - <a href="chap4-5.html"> "Conflicting information"</a><br>
<span>• Summary </span> - <a href="chap4-6.html"> John's Notes</a><br>
<div class="divider"></div>
<strong>After Hours Week 4</strong><br>
• <a href="afterhours4-1.html">"Merge merge merge"</a><br>
• <a href="afterhours4-2.html">"Grepping your life away"</a><br>
<div class="divider"></div>
<strong>Week 5</strong><br>
<span>• Day 1 </span> - <a href="chap5-1.html"> "This isn't working for me John"</a><br>
<span>• Day 2 </span> - <a href="chap5-2.html"> "Back to logging"</a><br>
<span>• Day 4 </span> - <a href="chap5-3.html"> "Advanced Techniques"</a><br>
<span>• Summary </span> - <a href="chap5-4.html"> John's Notes</a><br>
<div class="divider"></div>
<strong>After Hours Week 5</strong><br>
• <a href="afterhours5-1.html">"Splitting up commits the easy way"</a><br>
<div class="divider"></div>
<strong>Week 6</strong><br>
<span>• Day 1 </span> - <a href="chap6-1.html"> "My private little stash"</a><br>
<span>• Day 2 </span> - <a href="chap6-2.html"> "What?! No backup?"</a><br>
<span>• Day 3 </span> - <a href="chap6-3.html"> "Is this clone for real?"</a><br>
<span>• Day 4 </span> - <a href="chap6-4.html"> "Help I'm no longer up to date?"</a><br>
<span>• Day 5 </span> - <a href="chap6-5.html"> "I'm putting my foot down"</a><br>
<span>• Summary </span> - <a href="chap6-6.html"> John's Notes</a><br>
<div class="divider"></div>
<strong>After Hours Week 6</strong><br>
• <a href="afterhours6-1.html">"Tug of war"</a><br>
• <a href="afterhours6-2.html">"Referring to objects"</a><br>
<div class="divider"></div>
<strong>Week 7</strong><br>
<span>• Day 1 </span> - <a href="chap7-1.html"> "Networking with a difference"</a><br>
<span>• Day 2 </span> - <a href="chap7-2.html"> "Now let's work together"</a><br>
<span>• Day 3 </span> - <a href="chap7-3.html"> "Rebasing our commitments"</a><br>
<span>• Day 4 </span> - <a href="chap7-4.html"> "Starting to get rebased"</a><br>
<span>• Day 5 </span> - <a href="chap7-5.html"> "I could rebase the world"</a><br>
<span>• Summary </span> - <a href="chap7-6.html"> John's Notes</a><br>
<div class="divider"></div>
<strong>After Hours Week 7</strong><br>
• <a href="afterhours7-1.html">"Network Communicating"</a><br>
<div class="divider"></div>
<strong>Week 8</strong><br>
<span>• Day 1 </span> - <a href="chap8-1.html"> "Give a man a patch"</a><br>
<span>• Day 2 </span> - <a href="chap8-2.html"> "Looking for problems"</a><br>
<span>• Day 3 </span> - <a href="chap8-3.html"> "Filtered repos"</a><br>
<span>• Day 4 </span> - <a href="chap8-4.html"> "Let's make a library"</a><br>
<span>• Day 5 </span> - <a href="chap8-5.html"> "Shhh....we're in a library"</a><br>
<span>• Summary </span> - <a href="chap8-6.html"> John's Notes</a><br>
<div class="divider"></div>
<strong>After Hours Week 8</strong><br>
• <a href="afterhours8-1.html">"Fishing for beginners"</a><br>
<div class="divider"></div>
<strong>A little extra help</strong><br>
• <a href="chap9-1.html">Taking things further</a><br>
• <a href="chap9-2.html">The end of the journey</a><br>
<div class="divider"></div>
<td class="fade_right"> </td>
</tr>
<tr>
<td class="fade_bot"> </td>
<td class="fade_corner"> </td>
</tr>
</table> <h1> </h1>
</td>
<td><table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="read_content">
<h1>Week 1</h1><h2>Day 5 - "Working like a team"</h2>
<h3>Team Organisation</h3>
Now that we have the basics dealt with, let's take a little look at how John arranges his team, and see whether version control is going to work for them.
It is important that the team understands how the model should work, what they are expected to do and what level of access they have.
Most of the time people will get more frustrated about not knowing what they should or should not be doing, rather than that they do or don't have access to certain things.<br><div id="trenchblock"><strong>In the trenches...</strong><br>
It was 4:36pm on the Friday and the table in the board room was littered with empty coke cans, pizza boxes and one Japanese bento lunchbox, owned by a particularly stubborn member of the team who had vowed never to eat pizza again.
It had been Marcus' idea to bring in the food reinforcement to help the discussions along.
The team were trying to decide how to organise their model.<br><br>"There's nothing to say we can't use a combination of the models is there?" asked Mike.<br><br>"I suppose not," said John.
"What did you have in mind." His glasses were slipping down his forehead now and he was getting pretty tired.<br><br>"Well, I figure, we basically have the software split into two parts. We have the library, which myself, Klaus and Jack work on. Then there's the UI elements which Simon, Martha and Rob handle. I know there are the tools which Eugene works on too."
Everyone had started to listen to Mike as he continued.
"John, you don't want to have to deal with the library component as this more Klaus' space. So why don't we have two dictators. Klaus and yourself have access to push up to the blessed repository. John can pull from his guys, Klaus from his and we end up with a good model for version control."<br><br>John raised his eyebrows, "Not bad Mike," he said, genuinely impressed.
After spending a few hours going through the various models and who was in charge of what, it felt good to have finally reached a decision.<br><br>"So, we start on Monday then?" asked Markus, who had been listening from the other end of the table.<br><br>"Indeed." Announced Klaus, "Monday we all become Gits!"
</div><table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td><p align="left"><a href="chap1-3.html"><img src="images/prev.png" alt="Previous Day" height="29" border="0"></a></p></td>
<td><p align="right"><a href="afterhours1-1.html"><img src="images/next.png" alt="Next Day" height="29" border="0"></a></p></td>
</tr>
</table> </td>
<td class="fade_right"> </td>
</tr>
<tr>
<td class="fade_bot"> </td>
<td class="fade_corner"> </td>
</tr>
</table></td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="foot"><a href="index.html">home</a> | <a href="download.html">download</a> | <a href="intro.html">read now</a> | <a href="http://github.com/cbx33/gitt">source</a> | <a href="feedback.html">feedback</a> | <a href="legal.html">legal stuff</a><br>
</td>
</tr>
</table></td>
</tr>
</table>
</body>
</html>