deploy: c3b5eb3

_sources/introgitandgithub.md

@@ -56,7 +56,6 @@ There are three main approaches you can take:
 - [See these directions from Berkeley Statistics](https://statistics.berkeley.edu/computing/faqs/git-auth)
     - For additional directions, [see Github's Authentication documentation](https://docs.github.com/authentication)
 
-
 ___ 
 # Getting Started with Git and GitHub (Workshop)
 
@@ -647,10 +646,18 @@ After adding a descriptive message, click the green button to finalize the pull
 
 Now it's up to the repository owner if they wish to accept the request, initiate a conversation with you, or—which sometimes happens—ignore or reject your request. In the case of the DHRI curriculum, we may accept some requests right away, and ask for clarification on other occasions.
 
-
 # Conflicts
 [What do I do when my changes conflict with someone else’s?](https://swcarpentry.github.io/git-novice/09-conflict.html)
 
+# Collaborating  
+[How can I use version control to collaborate with other people?](https://swcarpentry.github.io/git-novice/08-collab.html)
+A BASIC COLLABORATIVE WORKFLOW
+* In practice, it is good to be sure that you have an updated version of the repository you are collaborating on, so you should git pull before making our changes. The basic collaborative workflow would be:
+- update your local repo with git pull origin main,
+- make your changes and stage them with git add,
+- commit your changes with git commit -m, and
+- upload the changes to GitHub with git push origin main
+It is better to make many commits with smaller changes rather than of one commit with massive changes: small commits are easier to read and review.
 
 ## Challenge
 
@@ -659,7 +666,7 @@ Now it's up to the repository owner if they wish to accept the request, initiate
 3. Make changes to the files on your local machine. Remember to save them!
 4. Use the 3-step process of stage, commit and push to return the amended files to the repository on GitHub.
 
-## Solution
+### Solution
 
 Rather than write out the solution here, I want to encourage you to go back through the lessons as needed.
 
@@ -668,13 +675,5 @@ You'll know you've completed step one when the project folder (called `\introduc
 After you've made and saved the changes, you'll know you've completed step three when your changes appear in the project folder on _your_ GitHub account.
 
 
-# Collaborating  
-[How can I use version control to collaborate with other people?](https://swcarpentry.github.io/git-novice/08-collab.html)
-A BASIC COLLABORATIVE WORKFLOW
-* In practice, it is good to be sure that you have an updated version of the repository you are collaborating on, so you should git pull before making our changes. The basic collaborative workflow would be:
-- update your local repo with git pull origin main,
-- make your changes and stage them with git add,
-- commit your changes with git commit -m, and
-- upload the changes to GitHub with git push origin main
-It is better to make many commits with smaller changes rather than of one commit with massive changes: small commits are easier to read and review.
+
 

introgitandgithub.html

@@ -457,12 +457,14 @@ <h2> Contents </h2>
 <li class="toc-h2 nav-item toc-entry"><a class="reference internal nav-link" href="#creating-a-pull-request">Creating a pull request</a></li>
 </ul>
 </li>
-<li class="toc-h1 nav-item toc-entry"><a class="reference internal nav-link" href="#conflicts">Conflicts</a><ul class="visible nav section-nav flex-column">
-<li class="toc-h2 nav-item toc-entry"><a class="reference internal nav-link" href="#id1">Challenge</a></li>
-<li class="toc-h2 nav-item toc-entry"><a class="reference internal nav-link" href="#solution">Solution</a></li>
+<li class="toc-h1 nav-item toc-entry"><a class="reference internal nav-link" href="#conflicts">Conflicts</a></li>
+<li class="toc-h1 nav-item toc-entry"><a class="reference internal nav-link" href="#collaborating">Collaborating</a><ul class="visible nav section-nav flex-column">
+<li class="toc-h2 nav-item toc-entry"><a class="reference internal nav-link" href="#id1">Challenge</a><ul class="nav section-nav flex-column">
+<li class="toc-h3 nav-item toc-entry"><a class="reference internal nav-link" href="#solution">Solution</a></li>
+</ul>
+</li>
 </ul>
 </li>
-<li class="toc-h1 nav-item toc-entry"><a class="reference internal nav-link" href="#collaborating">Collaborating</a></li>
 </ul>
 
             </nav>
@@ -971,21 +973,6 @@ <h2>Creating a pull request<a class="headerlink" href="#creating-a-pull-request"
 <section class="tex2jax_ignore mathjax_ignore" id="conflicts">
 <h1>Conflicts<a class="headerlink" href="#conflicts" title="Permalink to this heading">#</a></h1>
 <p><a class="reference external" href="https://swcarpentry.github.io/git-novice/09-conflict.html">What do I do when my changes conflict with someone else’s?</a></p>
-<section id="id1">
-<h2>Challenge<a class="headerlink" href="#id1" title="Permalink to this heading">#</a></h2>
-<ol class="arabic simple">
-<li><p>Fork and clone <a class="reference external" href="https://github.com/skills/introduction-to-github">the repository for Github’s Introduction to GitHub</a></p></li>
-<li><p>Note not only <em>what</em> you are doing, but also <em>where</em> you are working when completing these two different tasks.</p></li>
-<li><p>Make changes to the files on your local machine. Remember to save them!</p></li>
-<li><p>Use the 3-step process of stage, commit and push to return the amended files to the repository on GitHub.</p></li>
-</ol>
-</section>
-<section id="solution">
-<h2>Solution<a class="headerlink" href="#solution" title="Permalink to this heading">#</a></h2>
-<p>Rather than write out the solution here, I want to encourage you to go back through the lessons as needed.</p>
-<p>You’ll know you’ve completed step one when the project folder (called <code class="docutils literal notranslate"><span class="pre">\introduction-to-github-main</span></code>) shows up on your local machine.</p>
-<p>After you’ve made and saved the changes, you’ll know you’ve completed step three when your changes appear in the project folder on <em>your</em> GitHub account.</p>
-</section>
 </section>
 <section class="tex2jax_ignore mathjax_ignore" id="collaborating">
 <h1>Collaborating<a class="headerlink" href="#collaborating" title="Permalink to this heading">#</a></h1>
@@ -1001,6 +988,21 @@ <h1>Collaborating<a class="headerlink" href="#collaborating" title="Permalink to
 <li><p>upload the changes to GitHub with git push origin main
 It is better to make many commits with smaller changes rather than of one commit with massive changes: small commits are easier to read and review.</p></li>
 </ul>
+<section id="id1">
+<h2>Challenge<a class="headerlink" href="#id1" title="Permalink to this heading">#</a></h2>
+<ol class="arabic simple">
+<li><p>Fork and clone <a class="reference external" href="https://github.com/skills/introduction-to-github">the repository for Github’s Introduction to GitHub</a></p></li>
+<li><p>Note not only <em>what</em> you are doing, but also <em>where</em> you are working when completing these two different tasks.</p></li>
+<li><p>Make changes to the files on your local machine. Remember to save them!</p></li>
+<li><p>Use the 3-step process of stage, commit and push to return the amended files to the repository on GitHub.</p></li>
+</ol>
+<section id="solution">
+<h3>Solution<a class="headerlink" href="#solution" title="Permalink to this heading">#</a></h3>
+<p>Rather than write out the solution here, I want to encourage you to go back through the lessons as needed.</p>
+<p>You’ll know you’ve completed step one when the project folder (called <code class="docutils literal notranslate"><span class="pre">\introduction-to-github-main</span></code>) shows up on your local machine.</p>
+<p>After you’ve made and saved the changes, you’ll know you’ve completed step three when your changes appear in the project folder on <em>your</em> GitHub account.</p>
+</section>
+</section>
 </section>
 
     <script type="text/x-thebe-config">
@@ -1112,12 +1114,14 @@ <h1>Collaborating<a class="headerlink" href="#collaborating" title="Permalink to
 <li class="toc-h2 nav-item toc-entry"><a class="reference internal nav-link" href="#creating-a-pull-request">Creating a pull request</a></li>
 </ul>
 </li>
-<li class="toc-h1 nav-item toc-entry"><a class="reference internal nav-link" href="#conflicts">Conflicts</a><ul class="visible nav section-nav flex-column">
-<li class="toc-h2 nav-item toc-entry"><a class="reference internal nav-link" href="#id1">Challenge</a></li>
-<li class="toc-h2 nav-item toc-entry"><a class="reference internal nav-link" href="#solution">Solution</a></li>
+<li class="toc-h1 nav-item toc-entry"><a class="reference internal nav-link" href="#conflicts">Conflicts</a></li>
+<li class="toc-h1 nav-item toc-entry"><a class="reference internal nav-link" href="#collaborating">Collaborating</a><ul class="visible nav section-nav flex-column">
+<li class="toc-h2 nav-item toc-entry"><a class="reference internal nav-link" href="#id1">Challenge</a><ul class="nav section-nav flex-column">
+<li class="toc-h3 nav-item toc-entry"><a class="reference internal nav-link" href="#solution">Solution</a></li>
+</ul>
+</li>
 </ul>
 </li>
-<li class="toc-h1 nav-item toc-entry"><a class="reference internal nav-link" href="#collaborating">Collaborating</a></li>
 </ul>
 
   </nav></div>