depot distant

depot_distant.md

@@ -84,15 +84,15 @@ serveur et de les intégrer dans votre dépôt local.
 
 ![](depot_distant_08.svg)
 
-## Envoyer les commits locaux sur un dépôt distant
+## Envoyer (pousser) les commits locaux sur un dépôt distant
 
-Après des commits locaux,
+Après des commits locaux...
 
 ![](depot_distant_09a.png)
 
 ![](depot_distant_09a.svg)
 
-la commande `git push` permet d'envoyer vos commits locaux sur le serveur.
+... la commande `git push` permet d'envoyer vos commits locaux sur le serveur.
 
 ![](depot_distant_09b.png)
 
@@ -102,7 +102,7 @@ Les commits/fichiers envoyés sur le serveur sont alors visibles sur la page web
 
 ![](depot_distant_10.png)
 
-Vous pouvez également toujours voir le contenu de votre dépôt avec un client
+Vous pouvez également voir le contenu de votre dépôt avec un client
 graphique.
 
 ![](depot_distant_11.png)
@@ -114,21 +114,34 @@ l'envoyer sur le serveur. Pour cela, il faut d'abord faire un `git pull` avant
 le `git push` au cas où l'un de vos collaborateurs aurait envoyer une
 modification sur le serveur entre temps. 
 
-Si des modifications ont été faites en parallèle, git est souvent capable de
-les fusionner mais parfois il n'arrive pas à résoudre le conflit et il vous
-demande de le faire manuellement.
+Si des modifications ont été faites en parallèle...
+
+![](depot_distant_12a.svg)
+
+... git est souvent capable de les fusionner mais parfois il n'arrive pas à
+résoudre le conflit et il vous demande de le faire manuellement.
 
 ![](depot_distant_12.png)
 
+![](depot_distant_12b.svg)
+
 Pour résoudre un conflit, il suffit d'ouvrir le fichier en cause et de
 remplacez les zones marquées par le contenu que vous voulez obtenir. 
 Il existe des outils graphiques comme `meld` qui peuvent vous y aider.
 
 ![](depot_distant_13.png)
 
-Une fois les conflits édités, vous pouvez commiter et pusher vers le serveur.
+Une fois les conflits édités, vous pouvez commiter...
+
+![](depot_distant_14a.png)
+
+![](depot_distant_14a.svg)
+
+... et pusher vers le serveur.
+
+![](depot_distant_14b.png)
 
-![](depot_distant_14.png)
+![](depot_distant_14b.svg)
 
 ## Résumé et méthode de travail
 

depot_distant_09a.svg

@@ -10,22 +10,27 @@
 <circle cx="150" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
 <text x="130" y="55" font-size="18"> feb... </text>
 
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M180,50 L210,50' />
+<circle cx="250" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="230" y="55" font-size="18"> af2... </text>
+
 <defs>
 <marker id='head' orient="auto" markerWidth='4' markerHeight='8' refX='0.2' refY='3'>
 <path d='M0,0 V6 L3,3 Z' />
 </marker>
 </defs>
 
-<rect x="110" y="-70" width="80" height="40" fill="khaki" stroke-width="2" stroke="black" />
-<text x="125" y="-45" font-size="18"> HEAD </text>
-<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M150,-30 L150,10' />
+<rect x="210" y="-70" width="80" height="40" fill="khaki" stroke-width="2" stroke="black" />
+<text x="225" y="-45" font-size="18"> HEAD </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M250,-30 L250,10' />
 
-<rect x="110" y="120" width="80" height="40" fill="orange" stroke-width="2" stroke="black" />
-<text x="120" y="145" font-size="18"> master </text>
-<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M150,120 L150,90' />
+<rect x="210" y="120" width="80" height="40" fill="orange" stroke-width="2" stroke="black" />
+<text x="220" y="145" font-size="18"> master </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M250,120 L250,90' />
 
 <rect x="80" y="160" width="150" height="40" fill="lightblue" stroke-width="2" stroke="black" />
 <text x="90" y="185" font-size="18"> origin/master </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M150,160 L150,90' />
 
 </g>
 

depot_distant_09b.svg

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="400" height="300" >
+
+<g transform="translate(50,80)">
+
+<circle cx="50" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="30" y="55" font-size="18"> 8c7... </text>
+
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M80,50 L110,50' />
+<circle cx="150" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="130" y="55" font-size="18"> feb... </text>
+
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M180,50 L210,50' />
+<circle cx="250" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="230" y="55" font-size="18"> af2... </text>
+
+<defs>
+<marker id='head' orient="auto" markerWidth='4' markerHeight='8' refX='0.2' refY='3'>
+<path d='M0,0 V6 L3,3 Z' />
+</marker>
+</defs>
+
+<rect x="210" y="-70" width="80" height="40" fill="khaki" stroke-width="2" stroke="black" />
+<text x="225" y="-45" font-size="18"> HEAD </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M250,-30 L250,10' />
+
+<rect x="210" y="120" width="80" height="40" fill="orange" stroke-width="2" stroke="black" />
+<text x="220" y="145" font-size="18"> master </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M250,120 L250,90' />
+
+<rect x="180" y="160" width="150" height="40" fill="lightblue" stroke-width="2" stroke="black" />
+<text x="190" y="185" font-size="18"> origin/master </text>
+
+</g>
+
+</svg>
+

depot_distant_12a.svg

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="600" height="400" >
+
+<g transform="translate(50,80)">
+
+<circle cx="50" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="30" y="55" font-size="18"> 8c7... </text>
+
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M80,50 L110,50' />
+<circle cx="150" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="130" y="55" font-size="18"> feb... </text>
+
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M180,50 L210,50' />
+<circle cx="250" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="230" y="55" font-size="18"> af2... </text>
+
+<path marker-end='url(#head)' stroke-width='2' fill='none' stroke='black' 
+    d=' M250,80 C250,200 310,200 310,200 ' />
+<circle cx="350" cy="200" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M280,50 L410,50' />
+<circle cx="450" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="430" y="55" font-size="18"> c10... </text>
+
+<defs>
+<marker id='head' orient="auto" markerWidth='4' markerHeight='8' refX='0.2' refY='3'>
+<path d='M0,0 V6 L3,3 Z' />
+</marker>
+</defs>
+
+<rect x="410" y="-70" width="80" height="40" fill="khaki" stroke-width="2" stroke="black" />
+<text x="425" y="-45" font-size="18"> HEAD </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M450,-30 L450,10' />
+
+<rect x="410" y="120" width="80" height="40" fill="orange" stroke-width="2" stroke="black" />
+<text x="420" y="145" font-size="18"> master </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M450,120 L450,90' />
+
+<rect x="280" y="270" width="150" height="40" fill="lightblue" stroke-width="2" stroke="black" />
+<text x="290" y="295" font-size="18"> origin/master </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M350,270 L350,240' />
+
+</g>
+
+</svg>
+

depot_distant_12b.svg

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="800" height="400" >
+
+<g transform="translate(50,80)">
+
+<circle cx="50" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="30" y="55" font-size="18"> 8c7... </text>
+
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M80,50 L110,50' />
+<circle cx="150" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="130" y="55" font-size="18"> feb... </text>
+
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M180,50 L210,50' />
+<circle cx="250" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="230" y="55" font-size="18"> af2... </text>
+
+<path marker-end='url(#head)' stroke-width='2' fill='none' stroke='black' 
+    d=' M250,80 C250,200 310,200 310,200 ' />
+<circle cx="350" cy="200" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M280,50 L410,50' />
+<circle cx="450" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="430" y="55" font-size="18"> c10... </text>
+
+<path marker-end='url(#head)' stroke-width='2' fill='none' stroke='black' 
+    d=' M380,200 C550,200 550,90 550,90 ' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M480,50 L510,50' />
+<circle cx="550" cy="50" r="30" stroke="black" stroke-width="2" fill="white"/>
+
+<defs>
+<marker id='head' orient="auto" markerWidth='4' markerHeight='8' refX='0.2' refY='3'>
+<path d='M0,0 V6 L3,3 Z' />
+</marker>
+</defs>
+
+<rect x="510" y="-70" width="80" height="40" fill="khaki" stroke-width="2" stroke="black" />
+<text x="525" y="-45" font-size="18"> HEAD </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M550,-30 L550,10' />
+
+<rect x="410" y="120" width="80" height="40" fill="orange" stroke-width="2" stroke="black" />
+<text x="420" y="145" font-size="18"> master </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M450,120 L450,90' />
+
+<rect x="280" y="270" width="150" height="40" fill="lightblue" stroke-width="2" stroke="black" />
+<text x="290" y="295" font-size="18"> origin/master </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M350,270 L350,240' />
+
+</g>
+
+</svg>
+
+

depot_distant_14a.svg

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="800" height="350" >
+
+<g transform="translate(50,80)">
+
+<circle cx="50" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="30" y="55" font-size="18"> 8c7... </text>
+
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M80,50 L110,50' />
+<circle cx="150" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="130" y="55" font-size="18"> feb... </text>
+
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M180,50 L210,50' />
+<circle cx="250" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="230" y="55" font-size="18"> af2... </text>
+
+<path marker-end='url(#head)' stroke-width='2' fill='none' stroke='black' 
+    d=' M250,80 C250,150 310,150 310,150 ' />
+<circle cx="350" cy="150" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M280,50 L410,50' />
+<circle cx="450" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="430" y="55" font-size="18"> c10... </text>
+
+<path marker-end='url(#head)' stroke-width='2' fill='none' stroke='black' 
+    d=' M380,150 C450,150 450,120 515,75 ' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M480,50 L510,50' />
+<circle cx="550" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="530" y="55" font-size="18"> fe7... </text>
+
+<defs>
+<marker id='head' orient="auto" markerWidth='4' markerHeight='8' refX='0.2' refY='3'>
+<path d='M0,0 V6 L3,3 Z' />
+</marker>
+</defs>
+
+<rect x="510" y="-70" width="80" height="40" fill="khaki" stroke-width="2" stroke="black" />
+<text x="525" y="-45" font-size="18"> HEAD </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M550,-30 L550,10' />
+
+<rect x="510" y="120" width="80" height="40" fill="orange" stroke-width="2" stroke="black" />
+<text x="520" y="145" font-size="18"> master </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M550,120 L550,90' />
+
+<rect x="280" y="220" width="150" height="40" fill="lightblue" stroke-width="2" stroke="black" />
+<text x="290" y="245" font-size="18"> origin/master </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M350,220 L350,190' />
+
+</g>
+
+</svg>
+
+
+

depot_distant_14b.svg

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="800" height="300" >
+
+<g transform="translate(50,80)">
+
+<circle cx="50" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="30" y="55" font-size="18"> 8c7... </text>
+
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M80,50 L110,50' />
+<circle cx="150" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="130" y="55" font-size="18"> feb... </text>
+
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M180,50 L210,50' />
+<circle cx="250" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="230" y="55" font-size="18"> af2... </text>
+
+<path marker-end='url(#head)' stroke-width='2' fill='none' stroke='black' 
+    d=' M250,80 C250,150 310,150 310,150 ' />
+<circle cx="350" cy="150" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M280,50 L410,50' />
+<circle cx="450" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="430" y="55" font-size="18"> c10... </text>
+
+<path marker-end='url(#head)' stroke-width='2' fill='none' stroke='black' 
+    d=' M380,150 C450,150 450,120 515,75 ' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M480,50 L510,50' />
+<circle cx="550" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="530" y="55" font-size="18"> fe7... </text>
+
+<defs>
+<marker id='head' orient="auto" markerWidth='4' markerHeight='8' refX='0.2' refY='3'>
+<path d='M0,0 V6 L3,3 Z' />
+</marker>
+</defs>
+
+<rect x="510" y="-70" width="80" height="40" fill="khaki" stroke-width="2" stroke="black" />
+<text x="525" y="-45" font-size="18"> HEAD </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M550,-30 L550,10' />
+
+<rect x="510" y="120" width="80" height="40" fill="orange" stroke-width="2" stroke="black" />
+<text x="520" y="145" font-size="18"> master </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M550,120 L550,90' />
+
+<rect x="480" y="160" width="150" height="40" fill="lightblue" stroke-width="2" stroke="black" />
+<text x="490" y="185" font-size="18"> origin/master </text>
+
+</g>
+
+</svg>
+

depot_local.md

@@ -111,11 +111,11 @@ changé), ce qui est inefficace.
 
 D'autre part, il est inutile de versionner les fichiers autogénérés (créés
 automatiquement lors de la compilation du code). Par exemple, si on compile le
-code latex de notre projet : 
+code latex de notre projet...
 
 ![](depot_local_12.png)
 
-des fichiers intermédiaires sont créés et apparaissent lors des `git status` :
+... des fichiers intermédiaires sont créés et apparaissent lors des `git status` :
 
 ![](depot_local_13.png)