-
Notifications
You must be signed in to change notification settings - Fork 0
/
index.html
executable file
·490 lines (446 loc) · 15.1 KB
/
index.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
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>reveal.js – The HTML Presentation Framework</title>
<meta
name="description"
content="A framework for easily creating beautiful presentations using HTML"
/>
<meta name="author" content="Hakim El Hattab" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta
name="apple-mobile-web-app-status-bar-style"
content="black-translucent"
/>
<meta
name="viewport"
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
/>
<link rel="stylesheet" href="css/reveal.css" />
<link rel="stylesheet" href="css/theme/black.css" id="theme" />
<!-- Theme used for syntax highlighting of code -->
<link rel="stylesheet" href="lib/css/zenburn.css" />
<!-- Printing and PDF exports -->
<script>
var link = document.createElement("link");
link.rel = "stylesheet";
link.type = "text/css";
link.href = window.location.search.match(/print-pdf/gi)
? "css/print/pdf.css"
: "css/print/paper.css";
document.getElementsByTagName("head")[0].appendChild(link);
</script>
<!--[if lt IE 9]>
<script src="lib/js/html5shiv.js"></script>
<![endif]-->
</head>
<body>
<div class="reveal">
<!-- Any section element inside of this container is displayed as a slide -->
<div class="slides">
<section>
<h1>GIT</h1>
<h3>Le workflow de git chez eFaktory</h3>
<img data-src="img/git_logo.png" alt="Down arrow" />
<p>
<small>Créé par Joris HART</small>
</p>
</section>
<section id="fragments">
<h2>Notre workflow</h2>
<p class="fragment">Une branch pour le master</p>
<p class="fragment">Une branch pour le staging</p>
<p class="fragment">Une branch pour le develop</p>
<h3 class="fragment" style="color: red;">Ce qu'on ne veut pas !</h3>
<p class="fragment">
Plusieurs personnes travaillant sur la même branche
</p>
<p class="fragment">Non utilisation du potentiel de GIT</p>
<p class="fragment">Autre structure d'un projet à un autre</p>
<p class="fragment">
Des problèmes lors des mises en ligne / mise à jour
</p>
</section>
<section id="moment">
<h2>Ce qu'on ne veut pas . . .</h2>
<img data-src="img/push_run.jpg" alt="Git push and run" />
</section>
<section id="utils">
<h2>Les outils</h2>
<div class="fragment" style="width: 50%; float: left;">
<h4>Command line interface</h4>
<img data-src="img/bash.png" alt="Git bash" />
</div>
<div class="fragment" style="width: 50%; float: right;">
<h4>SourceTree</h4>
<img data-src="img/bitbucket-sourcetree.png" alt="sourcetree" />
</div>
</section>
<section id="workflow">
<h2>Pourquoi ce workflow ?</h2>
<p class="fragment fade-up">
Une structure similaire entre chaque projet
</p>
<p class="fragment fade-up">
Travailler en équipe sur le même projet
</p>
<p class="fragment fade-up">Séparation du live et staging</p>
<p class="fragment fade-up">Des mises en ligne sans risque</p>
<p class="fragment fade-up">
Utilisation de GIT comme outil de debug.
</p>
</section>
<section>
<img
data-src="img/workflow.png"
alt="workflow"
style="width: 500px;"
/>
</section>
<section id="init">
<h2>Initialisation</h2>
<img data-src="img/init.png" alt="init" style="width: 400px;" />
<div data-markdown>
<script type="text/template">
```
git clone [email protected]:parkour3_team/< NAME >.git
cd test-repo
echo "# My project's README" >> README.md
git add README.md
git commit -m "Initial commit"
git push -u origin master
```
</script>
</div>
</section>
<section id="readme">
<h2>README.md</h2>
<p>Partage de connaissace</p>
<p>Définition de l'environnement</p>
<p style="color: red;">
Les identifitiants administrateur se trouvent dans le dossier
LastPass qui est partagé avec l'équipe.
</p>
<a
href="https://dillinger.io/"
target="_blank"
style="font-size: 24px;"
>Éditeur en ligne</a
>
</section>
<section id="main-branches">
<h2>Les branches principales</h2>
<div class="fragment" style="width: 50%; float: left;">
<h4>Master</h4>
<p>Head = Le site LIVE</p>
<p>Pas de commit direct</p>
</div>
<div class="fragment" style="width: 50%; float: left;">
<h4>Staging</h4>
<p>l'environnement de test pour le client</p>
<p>Pas de commit direct</p>
</div>
<div class="fragment" style="width: 50%; float: right;">
<h4>Develop</h4>
<p>Les dernières développements</p>
<p>La branche commun entre développeurs</p>
</div>
<div style="clear: both;"></div>
<img
data-src="img/main-branches.png"
style="width: 200px;"
class="fragment"
/>
</section>
<section id="support-branches-features">
<h2>
Les branches <span class="fragment highlight-pink">features</span>
</h2>
<div class="fragment" style="width: 60%; float: left;">
<h4 style="text-align: left;">Règles</h4>
<ul style="font-size: 36px; margin-bottom: 15px;">
<li>
Provenance:
<span class="fragment highlight-yellow">develop</span>
</li>
<li>
Destination de merge:
<span class="fragment highlight-yellow">develop</span>
</li>
<li>Nom : feature/< NOM DU FEATURE ></li>
</ul>
<br />
<h4 style="text-align: left;">Création</h4>
<div data-markdown>
<script type="text/template">
```
$ git checkout -b feature/toto develop
```
</script>
</div>
</div>
<div class="fragment" style="width: 40%; float: right;">
<img
data-src="img/feature.png"
style="width: 200px;"
class="fragment"
/>
</div>
<div style="clear: both;"></div>
</section>
<section id="support-branches-features-merging">
<section>
<img data-src="img/merge.jpg" />
</section>
<section>
<h2>Faire des Merges</h2>
<div class="fragment">
<h4>Merge / Pull Requests</h4>
<p>Code Review</p>
<p>Possibilité d'utiliser le GUI</p>
</div>
<div data-markdown>
<script type="text/template">
```
$ git checkout develop
Switched to branch 'develop'
$ git merge --no-ff feature/toto
Updating ea1b82a..05e9557
(Summary of changes)
$ git push origin develop
```
</script>
</div>
<img
data-src="img/merge-without-ff.png"
class="fragment"
style="width: 350px;"
/>
</section>
</section>
<section id="support-branches-release">
<h2>
Les branches <span class="fragment highlight-green">release</span>
</h2>
<div class="fragment" style="width: 60%; float: left;">
<h4 style="text-align: left;">Règles</h4>
<ul style="font-size: 36px; margin-bottom: 15px;">
<li>
Provenance:
<span class="fragment highlight-yellow">develop</span>
</li>
<li>
Destination de merge:
<span class="fragment highlight-yellow">develop</span> et
<span class="fragment highlight-blue">master</span>
</li>
<li>Nom : release/< NOM DU PROJET HARVEST></li>
</ul>
<br />
<h4 style="text-align: left;">Création</h4>
<div data-markdown>
<script type="text/template">
```
$ git checkout -b release/toto1701 develop
```
</script>
</div>
</div>
<div class="fragment" style="width: 40%; float: right;">
<img data-src="img/release.png" class="fragment" />
</div>
<div style="clear: both;"></div>
</section>
<section id="support-branches-release-merging">
<section>
<h2>Faire des Merges</h2>
<img data-src="img/merge.gif" />
</section>
<section>
<h2>Faire des Merges</h2>
<h5>Vers Master</h5>
<div data-markdown>
<script type="text/template">
```
$ git checkout master
Switched to branch 'master'
$ git merge --no-ff release/toto1701
```
</script>
</div>
<h5>Vers Develop</h5>
<div data-markdown>
<script type="text/template">
```
$ git checkout develop
Switched to branch 'develop'
$ git merge --no-ff release/toto1701
```
</script>
</div>
</section>
</section>
<section id="support-branches-hotfix">
<h2>
Les branches <span class="fragment highlight-red">hotfix</span>
</h2>
<div class="fragment" style="width: 60%; float: left;">
<h4 style="text-align: left;">Règles</h4>
<ul style="font-size: 36px; margin-bottom: 15px;">
<li>
Provenance: <span class="fragment highlight-blue">master</span>
</li>
<li>
Destination de merge:
<span class="fragment highlight-yellow">develop</span> et
<span class="fragment highlight-blue">master</span>
</li>
<li>Nom : hotfix/< TAG ></li>
</ul>
<br />
<h4 style="text-align: left;">Création</h4>
<div data-markdown>
<script type="text/template">
```
$ git checkout -b hotfix/traduction master
```
</script>
</div>
</div>
<div class="fragment" style="width: 40%; float: right;">
<img
data-src="img/hotfix-branches.png"
style="width: 250px;"
class="fragment"
/>
</div>
<div style="clear: both;"></div>
</section>
<section>
<h2>Rebase</h2>
<script type="text/template">
```
A---B---C topic
/
D---E---F---G master
```
</script>
<script type="text/template">
```
$ git rebase master
$ git rebase master topic
```
</script>
<script type="text/template">
```
A'--B'--C' topic
/
D---E---F---G master
```
</script>
</section>
<section>
<h2>Best Practices</h2>
<img data-src="img/pull.jpg" />
<p class="fragment highlight-red">
Mettre à jour votre projet avant de commencer à travailler
</p>
</section>
<section>
<h2>Best Practices</h2>
<div style="width: 50%; float: left;">
<h4 class="fragment highlight-red">don'ts</h4>
<div data-markdown>
<script type="text/template">
```
$ git add -A
```
</script>
</div>
<div data-markdown>
<script type="text/template">
```
$ git add -am "fix"
```
</script>
</div>
</div>
<div style="width: 50%; float: right;">
<h4 class="fragment highlight-green">do's</h4>
<div data-markdown>
<script type="text/template">
```
$ git add /path/to/dir
```
</script>
</div>
<div data-markdown>
<script type="text/template">
```
$ git add /path/to/dir
$ git commit -m "Fix of translation in contest"
```
</script>
</div>
</div>
<div style="clear: both;"></div>
</section>
<section>
<h2>Last but not least</h2>
<img data-src="img/fire.jpg" class="fragment" style="width: 600px;" />
</section>
<section>
<h2>Source</h2>
<a
href="http://nvie.com/posts/a-successful-git-branching-model/"
target="_blank"
>A successful Git branching model - Vincent Driessen</a
>
</section>
</div>
</div>
<script src="lib/js/head.min.js"></script>
<script src="js/reveal.js"></script>
<script>
// More info https://github.com/hakimel/reveal.js#configuration
Reveal.initialize({
controls: true,
progress: true,
history: true,
center: true,
transition: "slide", // none/fade/slide/convex/concave/zoom
// More info https://github.com/hakimel/reveal.js#dependencies
dependencies: [
{
src: "lib/js/classList.js",
condition: function () {
return !document.body.classList;
},
},
{
src: "plugin/markdown/marked.js",
condition: function () {
return !!document.querySelector("[data-markdown]");
},
},
{
src: "plugin/markdown/markdown.js",
condition: function () {
return !!document.querySelector("[data-markdown]");
},
},
{
src: "plugin/highlight/highlight.js",
async: true,
callback: function () {
hljs.initHighlightingOnLoad();
},
},
{ src: "plugin/zoom-js/zoom.js", async: true },
{ src: "plugin/notes/notes.js", async: true },
],
});
</script>
</body>
</html>