solve conflicts

Author: ThierryO

docs/manual-git-rstudio.html

@@ -656,12 +656,19 @@ <h3 id="create-a-conflict">Create a conflict</h3>
 
 <h3 id="conflict">Conflict!</h3>
 <p>Try to push (click <code>push</code>) your local changes</p>
-<p>TODO-Thierry: update fig to rstudio <img src="manual-git/conflict.png" alt="Conflict" /></p>
+<p><img src="manual-git/conflict-rstudio1.png" alt="Conflict" /></p>
 </section>
 <section class="slide level2">
 
 <h3 id="keep-calm-and-resolve-conflict">Keep calm and resolve conflict</h3>
-<p>TODO-Thierry: check if correct</p>
+<ol type="1">
+<li>Click <code>Pull</code> to download the changes from Github</li>
+</ol>
+<p><img src="manual-git/conflict-rstudio2.png" alt="Conflict" /></p>
+</section>
+<section class="slide level2">
+
+<h3 id="keep-calm-and-resolve-conflict-1">Keep calm and resolve conflict</h3>
 <ol type="1">
 <li><p>Open <code>README.md</code> in RStudio:</p>
 <pre><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD

docs/manual-git/conflict-rstudio1.png

@@ -222,14 +222,19 @@ on a line you also edited locally
 
 Try to push (click `push`) your local changes
 
-TODO-Thierry: update fig to rstudio
-![Conflict](manual-git/conflict.png)
+![Conflict](manual-git/conflict-rstudio1.png)
 
 ---
 
 ### Keep calm and resolve conflict
 
-TODO-Thierry: check if correct
+1. Click `Pull` to download the changes from Github
+
+![Conflict](manual-git/conflict-rstudio2.png)
+
+---
+
+### Keep calm and resolve conflict
 
 1. Open `README.md` in RStudio: