deploy: d1da13a

dev/Resources/Applications/git.html

@@ -364,11 +364,23 @@ <h2>Switching branches<a class="headerlink" href="#switching-branches" title="Pe
 <li><p>To check which branch you are on, view the message input bar</p></li>
 </ul>
 <p><img alt="Checking branch" src="../../_images/vsc_branch.png" /></p>
+<ul class="simple">
+<li><p>Click on addional actions and click “checkout to”</p></li>
+</ul>
+<p><img alt="Checkout to" src="../../_images/vsc_checkout.png" /></p>
+<ul class="simple">
+<li><p>Select or create your branch</p></li>
+<li><p>Any branches starting with <code class="docutils literal notranslate"><span class="pre">origin/</span></code> will automatically pull from Github</p></li>
+</ul>
 </section>
 <section id="merging">
 <h2>Merging<a class="headerlink" href="#merging" title="Permalink to this heading">¶</a></h2>
 <ul class="simple">
-<li></li>
+<li><p>Go to the same additional actions menu and select Branch &gt; Merge</p></li>
+<li><p>Select which branches to merge from and to</p></li>
+<li><p>Always remember to notify other programming members before merging to avoid conflicts</p></li>
+<li><p>If a merge is a particularly big change, use <a class="reference external" href="https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests">pull requests</a> instead</p></li>
+<li><p>Try to avoid merge conflicts by only working on specific files in one branch</p></li>
 </ul>
 </section>
 </section>

dev/_sources/Resources/Applications/git.md.txt

@@ -21,16 +21,16 @@ This is a short cheatsheet on VSCode source control usage. Feel free to use Git
 * Cloning is downloading a repository
 * First, click on green Code button and copy the HTTPS link
 
-![Copying HTTPS link](./git_clone.png "Copying HTTPS link")
+![Copying HTTPS link](./images/git_clone.png "Copying HTTPS link")
 
 * Second, go to VSCode source control tab and click clone
 
-![Cloning](./vsc_clone.png "Cloning")
+![Cloning](./images/vsc_clone.png "Cloning")
 
 * Paste your link and press enter
 * Select a folder to save the project in
 
-![Pasting](./vsc_paste.png "Pasting")
+![Pasting](./images/vsc_paste.png "Pasting")
 
 * Open the same folder next time to open the project
 * Please don't clone the repo every time you want to work on it!
@@ -49,14 +49,25 @@ This is a short cheatsheet on VSCode source control usage. Feel free to use Git
 * You can click VSCode's blue "sync" button, which will push and pull at the same time
 * Otherwise, you can click on additional actions and click push or pull
 
-![Push/pull actions](./vsc_push_pull.png "Push/pull actions")
+![Push/pull actions](./images/vsc_push_pull.png "Push/pull actions")
 
 ## Switching branches
 
-* To check which branch you are on, view the message input bar 
+* To check which branch you are on, view the message input bar
 
-![Checking branch](./vsc_branch.png "Checking branch")
+![Checking branch](./images/vsc_branch.png "Checking branch")
+
+* Click on addional actions and click "checkout to"
+
+![Checkout to](./images/vsc_checkout.png "Checkout to")
+
+* Select or create your branch
+* Any branches starting with `origin/` will automatically pull from Github
 
 ## Merging
 
-* 
+* Go to the same additional actions menu and select Branch > Merge
+* Select which branches to merge from and to
+* Always remember to notify other programming members before merging to avoid conflicts
+* If a merge is a particularly big change, use [pull requests](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests) instead
+* Try to avoid merge conflicts by only working on specific files in one branch