Built site for gh-pages

UCSB-Library-Research-Data-Services · Nov 27, 2024 · ad9ede0 · ad9ede0
1 parent 04d7f38
commit ad9ede0
Show file tree

Hide file tree

Showing 33 changed files with 280 additions and 280 deletions.
diff --git a/.nojekyll b/.nojekyll
@@ -1 +1 @@
-0e4c91f1
+735a0f90
diff --git a/01-handson_github_website.html b/01-handson_github_website.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>

diff --git a/02-handson_github_rstudio.html b/02-handson_github_rstudio.html
@@ -64,7 +64,7 @@
 <script src="site_libs/quarto-search/fuse.min.js"></script>
 <script src="site_libs/quarto-search/quarto-search.js"></script>
 <meta name="quarto:offset" content="./">
-<link href="./github_template.html" rel="next">
+<link href="./git_conflicts.html" rel="next">
 <link href="./03-handson_github_workflows.html" rel="prev">
 <script src="site_libs/quarto-html/quarto.js"></script>
 <script src="site_libs/quarto-html/popper.min.js"></script>
@@ -198,12 +198,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -237,7 +231,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -263,6 +257,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link active">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
@@ -912,8 +912,8 @@ <h2 class="anchored" data-anchor-id="is-your-fav-dessert-iconic">Is your fav’
       </a>          
   </div>
   <div class="nav-page nav-page-next">
-      <a href="./github_template.html" class="pagination-link" aria-label="Repository template">
-        <span class="nav-page-text">Repository template</span> <i class="bi bi-arrow-right-short"></i>
+      <a href="./git_conflicts.html" class="pagination-link" aria-label="Managing conflicts">
+        <span class="nav-page-text">Managing conflicts</span> <i class="bi bi-arrow-right-short"></i>
       </a>
   </div>
 </nav>

diff --git a/03-handson_github_workflows.html b/03-handson_github_workflows.html
@@ -198,12 +198,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -237,7 +231,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -263,6 +257,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>

diff --git a/about.html b/about.html
@@ -163,12 +163,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -202,7 +196,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -228,6 +222,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>

diff --git a/coding.html b/coding.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>

diff --git a/collab_exchange.html b/collab_exchange.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>

diff --git a/collab_pairprog.html b/collab_pairprog.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>
@@ -860,8 +860,8 @@ <h2 class="anchored" data-anchor-id="acknowledgements">Acknowledgements</h2>
       </a>          
   </div>
   <div class="nav-page nav-page-next">
-      <a href="./github_org.html" class="pagination-link" aria-label="GitHub Organizations for your Lab">
-        <span class="nav-page-text">GitHub Organizations for your Lab</span> <i class="bi bi-arrow-right-short"></i>
+      <a href="./github_org.html" class="pagination-link" aria-label="GitHub Organization for your Lab">
+        <span class="nav-page-text">GitHub Organization for your Lab</span> <i class="bi bi-arrow-right-short"></i>
       </a>
   </div>
 </nav>

diff --git a/data_mgmt.html b/data_mgmt.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>

diff --git a/datamgmt_manage.html b/datamgmt_manage.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>

diff --git a/datamgmt_plan.html b/datamgmt_plan.html
@@ -164,12 +164,6 @@
   <a href="./git_cli.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Using git at the command line</span></a>
   </div>
-</li>
-          <li class="sidebar-item">
-  <div class="sidebar-item-container"> 
-  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">Managing conflicts</span></a>
-  </div>
 </li>
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
@@ -203,7 +197,7 @@
           <li class="sidebar-item">
   <div class="sidebar-item-container"> 
   <a href="./github_org.html" class="sidebar-item-text sidebar-link">
- <span class="menu-text">GitHub Organizations for your Lab</span></a>
+ <span class="menu-text">GitHub Organization for your Lab</span></a>
   </div>
 </li>
           <li class="sidebar-item">
@@ -229,6 +223,12 @@
   <a href="./02-handson_github_rstudio.html" class="sidebar-item-text sidebar-link">
  <span class="menu-text">Hands-on: Branches using RStudio</span></a>
   </div>
+</li>
+          <li class="sidebar-item">
+  <div class="sidebar-item-container"> 
+  <a href="./git_conflicts.html" class="sidebar-item-text sidebar-link">
+ <span class="menu-text">Managing conflicts</span></a>
+  </div>
 </li>
       </ul>
   </li>