how to create and push a new branch and switch to a branch

Author: ThierryO

docs/manual-git-rstudio.html

@@ -733,34 +733,44 @@ <h3 id="create-a-branch-to-experiment">Create a branch to experiment</h3>
 </section>
 <section class="slide level2">
 
-<h3 id="create-a-branch-to-experiment-command-line">Create a branch to experiment (command line)</h3>
+<h3 id="create-a-branch-to-experiment-1">Create a branch to experiment</h3>
 <ol type="1">
-<li><p>Create a branch by a checkout to new branch, <code>git checkout -b</code>:</p>
+<li>Open the git shell</li>
+<li><p>Create a branch by a checkout to new branch</p>
 <pre><code>git checkout -b analysis-script</code></pre></li>
 <li><p>Get an overview of your branches: <code>git branch</code></p></li>
 </ol>
-<p>TODO-Thierry: add screenshot of shell-version</p>
+<p><img src="manual-git/create-branch-rstudio.png" alt="Create branch" /></p>
 </section>
 <section class="slide level2">
 
 <h3 id="effect-of-changing-switching-branches">Effect of changing switching branches</h3>
 <p>Add a file to the repository in a <code>src</code>-directory (see earlier)</p>
 <ol type="1">
-<li>Go back to the status of the <code>master</code> branch: TODO-thierry: add screenshot</li>
+<li>Go back to the status of the <code>master</code> branch</li>
+<li>Click on <code>analysis-script</code> in the <code>git</code> pane and select <code>(LOCAL BRANCHES) -&gt; master</code> <img src="manual-git/branch-rstudio1.png" alt="Switch branch" /></li>
+</ol>
+<p><img src="manual-git/branch-rstudio2.png" alt="Switch branch" /></p>
+</section>
+<section class="slide level2">
+
+<h3 id="effect-of-changing-switching-branches-1">Effect of changing switching branches</h3>
+<ol type="1">
 <li>Verify your local directory structure: where are your files?</li>
-<li>Go back to the status of the new branch (e.g. <code>analysis-script</code>): TODO-thierry: add screenshot</li>
+<li>Go back to the status of the new branch (e.g. <code>analysis-script</code>)</li>
+<li>Verify your local directory structure again: where are your files?</li>
 </ol>
 </section>
 <section class="slide level2">
 
 <h3 id="first-push-of-a-new-branch">First push of a new branch</h3>
-<p>TODO-Thierry: check if this is correct</p>
 <ol type="1">
-<li>Go to <code>Tools &gt; Shell</code> to open the Git Shell</li>
-<li>Type <code>git push -u origin</code></li>
+<li>Notice that the <code>pull</code> and <code>push</code> buttons in the <code>git</code> pane are grayed out</li>
+<li>Open the Git Shell</li>
+<li>Type <code>git push -u origin analysis-script</code></li>
 </ol>
-<p>After this first time, you can just click <code>push</code></p>
-<p>TODO-Thierry: screenshot</p>
+<p>This will also activate the <code>pull</code> and <code>push</code> buttons</p>
+<p><img src="manual-git/branch-first-push-rstudio.png" alt="First push branch" /></p>
 </section>
 <section class="slide level2">
 

docs/manual-git/branch-first-push-rstudio.png

@@ -302,40 +302,49 @@ Try to push (click `push`) your local changes
 
 ---
 
-### Create a branch to experiment (command line)
+### Create a branch to experiment
 
-1. Create a branch by a checkout to new branch, `git checkout -b`: 
+1. Open the git shell
+1. Create a branch by a checkout to new branch 
     ```
     git checkout -b analysis-script
     ```
-2. Get an overview of your branches: `git branch`
+1. Get an overview of your branches: `git branch`
 
-TODO-Thierry: add screenshot of shell-version
+![Create branch](manual-git/create-branch-rstudio.png)
 
 ---
 
 ### Effect of changing switching branches
 
 Add a file to the repository in a `src`-directory (see earlier)
 
-1. Go back to the status of the `master` branch: 
-TODO-thierry: add screenshot
-2. Verify your local directory structure: where are your files?
-3. Go back to the status of the new branch (e.g. `analysis-script`): 
-TODO-thierry: add screenshot
+1. Go back to the status of the `master` branch
+1. Click on `analysis-script` in the `git` pane and select `(LOCAL BRANCHES) -> master`
+![Switch branch](manual-git/branch-rstudio1.png)
+
+![Switch branch](manual-git/branch-rstudio2.png)
+
+---
+
+### Effect of changing switching branches
+
+1. Verify your local directory structure: where are your files?
+1. Go back to the status of the new branch (e.g. `analysis-script`)
+1. Verify your local directory structure again: where are your files?
 
 ---
 
 ### First push of a new branch
 
-TODO-Thierry: check if this is correct
+1. Notice that the `pull` and `push` buttons in the `git` pane are grayed out
+1. Open the Git Shell
+1. Type `git push -u origin analysis-script`
 
-1. Go to `Tools > Shell` to open the Git Shell
-2. Type `git push -u origin`
+This will also activate the `pull` and `push` buttons
 
-After this first time, you can just click `push`
+![First push branch](manual-git/branch-first-push-rstudio.png)
 
-TODO-Thierry: screenshot
 
 ---