Merge branch 'main' of https://github.com/fhdsl/S2-Collaborative-Git-…

…GitHub into main

docs/no_toc/01-workshop.md

@@ -1,4 +1,5 @@
 
+# Workshop Notes
 
 ## Review Intro to Git material
 

docs/no_toc/404.html

@@ -4,19 +4,19 @@
 
   <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-  <title>Page not found | WDL Workflows Guide</title>
+  <title>Page not found | Collaborative Git and GitHub</title>
   <meta name="description" content="Description about Course/Book." />
   <meta name="generator" content="bookdown 0.24 and GitBook 2.6.7" />
 
-  <meta property="og:title" content="Page not found | WDL Workflows Guide" />
+  <meta property="og:title" content="Page not found | Collaborative Git and GitHub" />
   <meta property="og:type" content="book" />
 
 
   <meta property="og:description" content="Description about Course/Book." />
 
 
   <meta name="twitter:card" content="summary" />
-  <meta name="twitter:title" content="Page not found | WDL Workflows Guide" />
+  <meta name="twitter:title" content="Page not found | Collaborative Git and GitHub" />
 
   <meta name="twitter:description" content="Description about Course/Book." />
 
@@ -74,40 +74,43 @@
 <li class="chapter" data-level="" data-path="index.html"><a href="index.html"><i class="fa fa-check"></i>About this Course</a>
 <ul>
 <li class="chapter" data-level="0.1" data-path="index.html"><a href="index.html#target-audience"><i class="fa fa-check"></i><b>0.1</b> Target Audience</a></li>
-<li class="chapter" data-level="0.2" data-path="index.html"><a href="index.html#review-intro-to-git-material"><i class="fa fa-check"></i><b>0.2</b> Review Intro to Git material</a></li>
-<li class="chapter" data-level="0.3" data-path="index.html"><a href="index.html#intro-to-branching-and-merging"><i class="fa fa-check"></i><b>0.3</b> Intro to Branching and Merging</a></li>
-<li class="chapter" data-level="0.4" data-path="index.html"><a href="index.html#set-up"><i class="fa fa-check"></i><b>0.4</b> Set up</a>
+</ul></li>
+<li class="chapter" data-level="1" data-path="workshop-notes.html"><a href="workshop-notes.html"><i class="fa fa-check"></i><b>1</b> Workshop Notes</a>
+<ul>
+<li class="chapter" data-level="1.1" data-path="workshop-notes.html"><a href="workshop-notes.html#review-intro-to-git-material"><i class="fa fa-check"></i><b>1.1</b> Review Intro to Git material</a></li>
+<li class="chapter" data-level="1.2" data-path="workshop-notes.html"><a href="workshop-notes.html#intro-to-branching-and-merging"><i class="fa fa-check"></i><b>1.2</b> Intro to Branching and Merging</a></li>
+<li class="chapter" data-level="1.3" data-path="workshop-notes.html"><a href="workshop-notes.html#set-up"><i class="fa fa-check"></i><b>1.3</b> Set up</a>
 <ul>
-<li class="chapter" data-level="0.4.1" data-path="index.html"><a href="index.html#installing-git"><i class="fa fa-check"></i><b>0.4.1</b> Installing Git</a></li>
-<li class="chapter" data-level="0.4.2" data-path="index.html"><a href="index.html#installing-github-command-line-tools"><i class="fa fa-check"></i><b>0.4.2</b> Installing GitHub Command Line Tools</a></li>
-<li class="chapter" data-level="0.4.3" data-path="index.html"><a href="index.html#create-a-github-account"><i class="fa fa-check"></i><b>0.4.3</b> Create a GitHub account</a></li>
-<li class="chapter" data-level="0.4.4" data-path="index.html"><a href="index.html#adding-your-information-for-git"><i class="fa fa-check"></i><b>0.4.4</b> Adding your information for Git</a></li>
-<li class="chapter" data-level="0.4.5" data-path="index.html"><a href="index.html#connecting-git-to-your-github-account"><i class="fa fa-check"></i><b>0.4.5</b> Connecting Git to your GitHub account</a></li>
-<li class="chapter" data-level="0.4.6" data-path="index.html"><a href="index.html#optional-change-text-editor"><i class="fa fa-check"></i><b>0.4.6</b> Optional: change text editor</a></li>
+<li class="chapter" data-level="1.3.1" data-path="workshop-notes.html"><a href="workshop-notes.html#installing-git"><i class="fa fa-check"></i><b>1.3.1</b> Installing Git</a></li>
+<li class="chapter" data-level="1.3.2" data-path="workshop-notes.html"><a href="workshop-notes.html#installing-github-command-line-tools"><i class="fa fa-check"></i><b>1.3.2</b> Installing GitHub Command Line Tools</a></li>
+<li class="chapter" data-level="1.3.3" data-path="workshop-notes.html"><a href="workshop-notes.html#create-a-github-account"><i class="fa fa-check"></i><b>1.3.3</b> Create a GitHub account</a></li>
+<li class="chapter" data-level="1.3.4" data-path="workshop-notes.html"><a href="workshop-notes.html#adding-your-information-for-git"><i class="fa fa-check"></i><b>1.3.4</b> Adding your information for Git</a></li>
+<li class="chapter" data-level="1.3.5" data-path="workshop-notes.html"><a href="workshop-notes.html#connecting-git-to-your-github-account"><i class="fa fa-check"></i><b>1.3.5</b> Connecting Git to your GitHub account</a></li>
+<li class="chapter" data-level="1.3.6" data-path="workshop-notes.html"><a href="workshop-notes.html#optional-change-text-editor"><i class="fa fa-check"></i><b>1.3.6</b> Optional: change text editor</a></li>
 </ul></li>
-<li class="chapter" data-level="0.5" data-path="index.html"><a href="index.html#branching"><i class="fa fa-check"></i><b>0.5</b> Branching</a></li>
-<li class="chapter" data-level="0.6" data-path="index.html"><a href="index.html#merging"><i class="fa fa-check"></i><b>0.6</b> Merging</a>
+<li class="chapter" data-level="1.4" data-path="workshop-notes.html"><a href="workshop-notes.html#branching"><i class="fa fa-check"></i><b>1.4</b> Branching</a></li>
+<li class="chapter" data-level="1.5" data-path="workshop-notes.html"><a href="workshop-notes.html#merging"><i class="fa fa-check"></i><b>1.5</b> Merging</a>
 <ul>
-<li class="chapter" data-level="0.6.1" data-path="index.html"><a href="index.html#deleting-branches"><i class="fa fa-check"></i><b>0.6.1</b> Deleting branches</a></li>
-<li class="chapter" data-level="0.6.2" data-path="index.html"><a href="index.html#merge-conflicts"><i class="fa fa-check"></i><b>0.6.2</b> Merge conflicts</a></li>
+<li class="chapter" data-level="1.5.1" data-path="workshop-notes.html"><a href="workshop-notes.html#deleting-branches"><i class="fa fa-check"></i><b>1.5.1</b> Deleting branches</a></li>
+<li class="chapter" data-level="1.5.2" data-path="workshop-notes.html"><a href="workshop-notes.html#merge-conflicts"><i class="fa fa-check"></i><b>1.5.2</b> Merge conflicts</a></li>
 </ul></li>
-<li class="chapter" data-level="0.7" data-path="index.html"><a href="index.html#pull-requests"><i class="fa fa-check"></i><b>0.7</b> Pull requests</a>
+<li class="chapter" data-level="1.6" data-path="workshop-notes.html"><a href="workshop-notes.html#pull-requests"><i class="fa fa-check"></i><b>1.6</b> Pull requests</a>
 <ul>
-<li class="chapter" data-level="0.7.1" data-path="index.html"><a href="index.html#connect-to-course-github-repository"><i class="fa fa-check"></i><b>0.7.1</b> Connect to course GitHub repository</a></li>
-<li class="chapter" data-level="0.7.2" data-path="index.html"><a href="index.html#branching-with-remotes"><i class="fa fa-check"></i><b>0.7.2</b> Branching with remotes</a></li>
-<li class="chapter" data-level="0.7.3" data-path="index.html"><a href="index.html#pull-requests-1"><i class="fa fa-check"></i><b>0.7.3</b> Pull Requests</a></li>
-<li class="chapter" data-level="0.7.4" data-path="index.html"><a href="index.html#merge-conflicts-during-pull-requests"><i class="fa fa-check"></i><b>0.7.4</b> Merge conflicts during pull requests</a></li>
-<li class="chapter" data-level="0.7.5" data-path="index.html"><a href="index.html#code-reviews-during-a-pull-request"><i class="fa fa-check"></i><b>0.7.5</b> Code reviews during a pull request</a></li>
+<li class="chapter" data-level="1.6.1" data-path="workshop-notes.html"><a href="workshop-notes.html#connect-to-course-github-repository"><i class="fa fa-check"></i><b>1.6.1</b> Connect to course GitHub repository</a></li>
+<li class="chapter" data-level="1.6.2" data-path="workshop-notes.html"><a href="workshop-notes.html#branching-with-remotes"><i class="fa fa-check"></i><b>1.6.2</b> Branching with remotes</a></li>
+<li class="chapter" data-level="1.6.3" data-path="workshop-notes.html"><a href="workshop-notes.html#pull-requests-1"><i class="fa fa-check"></i><b>1.6.3</b> Pull Requests</a></li>
+<li class="chapter" data-level="1.6.4" data-path="workshop-notes.html"><a href="workshop-notes.html#merge-conflicts-during-pull-requests"><i class="fa fa-check"></i><b>1.6.4</b> Merge conflicts during pull requests</a></li>
+<li class="chapter" data-level="1.6.5" data-path="workshop-notes.html"><a href="workshop-notes.html#code-reviews-during-a-pull-request"><i class="fa fa-check"></i><b>1.6.5</b> Code reviews during a pull request</a></li>
 </ul></li>
-<li class="chapter" data-level="0.8" data-path="index.html"><a href="index.html#appendix-local-and-remote-as-branches"><i class="fa fa-check"></i><b>0.8</b> Appendix: Local and remote as branches</a>
+<li class="chapter" data-level="1.7" data-path="workshop-notes.html"><a href="workshop-notes.html#appendix-local-and-remote-as-branches"><i class="fa fa-check"></i><b>1.7</b> Appendix: Local and remote as branches</a>
 <ul>
-<li class="chapter" data-level="0.8.1" data-path="index.html"><a href="index.html#local-and-remote-branches-in-action"><i class="fa fa-check"></i><b>0.8.1</b> Local and remote branches in action</a></li>
+<li class="chapter" data-level="1.7.1" data-path="workshop-notes.html"><a href="workshop-notes.html#local-and-remote-branches-in-action"><i class="fa fa-check"></i><b>1.7.1</b> Local and remote branches in action</a></li>
 </ul></li>
-<li class="chapter" data-level="0.9" data-path="index.html"><a href="index.html#appendix-github-issues"><i class="fa fa-check"></i><b>0.9</b> Appendix: GitHub issues</a></li>
-<li class="chapter" data-level="0.10" data-path="index.html"><a href="index.html#appendix-references"><i class="fa fa-check"></i><b>0.10</b> Appendix: References</a></li>
+<li class="chapter" data-level="1.8" data-path="workshop-notes.html"><a href="workshop-notes.html#appendix-github-issues"><i class="fa fa-check"></i><b>1.8</b> Appendix: GitHub issues</a></li>
+<li class="chapter" data-level="1.9" data-path="workshop-notes.html"><a href="workshop-notes.html#appendix-references"><i class="fa fa-check"></i><b>1.9</b> Appendix: References</a></li>
 </ul></li>
 <li class="chapter" data-level="" data-path="about-the-authors.html"><a href="about-the-authors.html"><i class="fa fa-check"></i>About the Authors</a></li>
-<li class="chapter" data-level="1" data-path="references.html"><a href="references.html"><i class="fa fa-check"></i><b>1</b> References</a></li>
+<li class="chapter" data-level="2" data-path="references.html"><a href="references.html"><i class="fa fa-check"></i><b>2</b> References</a></li>
 <li class="divider"></li>
 <p style="text-align:center;"> <a href="https://github.com/jhudsl/OTTR_Template" target="blank" > This content was published with</a> <a href="https://bookdown.org/" target="blank"> bookdown by: </a> </p>
 <p style="text-align:center;"> <a href="https://hutchdatascience.org/"> The Fred Hutch Data Science Lab </a></p>
@@ -122,7 +125,7 @@
       <div class="body-inner">
         <div class="book-header" role="navigation">
           <h1>
-            <i class="fa fa-circle-o-notch fa-spin"></i><a href="./">WDL Workflows Guide</a>
+            <i class="fa fa-circle-o-notch fa-spin"></i><a href="./">Collaborative Git and GitHub</a>
           </h1>
         </div>