From 6227427bcad9e567abdea6fcceb398ba8abba485 Mon Sep 17 00:00:00 2001 From: James Howison Date: Wed, 14 Feb 2024 15:19:15 -0600 Subject: [PATCH] edited branching --- docs/current/index.html | 205 +++++++-- .../insights/bias_lack_of_diversity.html | 205 +++++++-- docs/current/insights/coordination.html | 209 +++++++-- docs/current/insights/governance.html | 207 +++++++-- docs/current/insights/licenses.html | 217 +++++++-- docs/current/insights/motivations.html | 258 ++++++++--- .../insights/paper_plane_innovation.html | 211 +++++++-- docs/current/insights/stack_and_stream.html | 211 +++++++-- .../current/insights/what_is_open_source.html | 221 +++++++-- docs/current/oss_syllabus.html | 419 +++++++++++------- docs/current/search.json | 71 +-- .../site_libs/bootstrap/bootstrap-icons.css | 316 ++++++++++++- .../site_libs/bootstrap/bootstrap-icons.woff | Bin 137124 -> 164168 bytes .../site_libs/bootstrap/bootstrap.min.css | 4 +- .../site_libs/clipboard/clipboard.min.js | 4 +- .../site_libs/quarto-diagram/mermaid-init.js | 95 +++- .../quarto-syntax-highlighting.css | 32 ++ docs/current/site_libs/quarto-html/quarto.js | 305 ++++++++----- .../site_libs/quarto-nav/quarto-nav.js | 53 ++- .../quarto-search/autocomplete.umd.js | 4 +- .../site_libs/quarto-search/fuse.min.js | 6 +- .../site_libs/quarto-search/quarto-search.js | 33 +- docs/current/skills/branching.html | 370 ++++++++++------ docs/current/skills/git_basic_workflow.html | 250 +++++++---- .../skills/git_cherrypick_split_pr.html | 270 +++++++---- docs/current/skills/git_delete_history.html | 205 +++++++-- docs/current/skills/git_rebase.html | 238 +++++++--- docs/current/skills/git_rewinding_work.html | 246 +++++++--- docs/current/skills/github_collaboration.html | 290 +++++++----- docs/current/skills/github_solo.html | 262 +++++++---- docs/current/skills/paper_planes_git.html | 220 +++++++-- docs/current/skills/skills_faq.html | 255 +++++++---- quarto_course/insights/motivations.qmd | 4 + quarto_course/oss_syllabus.qmd | 4 +- quarto_course/skills/branching.qmd | 43 +- 35 files changed, 4446 insertions(+), 1497 deletions(-) diff --git a/docs/current/index.html b/docs/current/index.html index 3c6cbaf..9b2ddbb 100644 --- a/docs/current/index.html +++ b/docs/current/index.html @@ -2,7 +2,7 @@ - + @@ -18,7 +18,7 @@ ul.task-list{list-style: none;} ul.task-list li input[type="checkbox"] { width: 0.8em; - margin: 0 0.8em 0.2em -1.6em; + margin: 0 0.8em 0.2em -1em; /* quarto-specific, see https://github.com/quarto-dev/quarto-cli/issues/4556 */ vertical-align: middle; } @@ -68,11 +68,16 @@
- @@ -80,35 +85,38 @@

Open Source Software Development: A socio
-