Skip to content

Commit

Permalink
deploy: 5f29627
Browse files Browse the repository at this point in the history
  • Loading branch information
@jsimonrichard
jsimonrichard committed Jan 19, 2025
1 parent 4045bf4 commit 1dcd6eb
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 11 deletions.
4 changes: 2 additions & 2 deletions ch2-git.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<!-- Book generated using mdBook -->
<meta charset="UTF-8">
<title>What is Git? - The CPT&#x27;s Linux / Git Workshop</title>
<title>What is git? - The CPT&#x27;s Linux / Git Workshop</title>


<!-- Custom HTML head -->
Expand Down Expand Up @@ -160,7 +160,7 @@ <h1 class="menu-title">The CPT&#x27;s Linux / Git Workshop</h1>

<div id="content" class="content">
<main>
<h1 id="what-is-git"><a class="header" href="#what-is-git">What is Git?</a></h1>
<h1 id="what-is-git"><a class="header" href="#what-is-git">What is git?</a></h1>
<p>Git is a version control system (VCS), which means that it saves, compares, and manages changes to files (usually code files) over time.</p>
<p>This may seem innocuous, but it's actually vital to the development cycle. Virtually all professional code is managed by some VCS, and git is by far the most common.</p>
<h2 id="use-cases"><a class="header" href="#use-cases">Use cases</a></h2>
Expand Down
18 changes: 17 additions & 1 deletion ch2.2-using-git.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ <h3 id="merging-branches"><a class="header" href="#merging-branches">Merging bra
<p>and then run the <code>git merge</code> command.</p>
<pre><code class="language-bash">git merge branch_a
</code></pre>
<p>If the files modified in <code>main</code> and <code>branch_a</code> (after <code>branch_a</code> was created or after the last merge) are mutually exclusive, then git should be able to do this automatically. However, if the same file was modified in both branches, you probably encounter this:</p>
<p>If the files modified in <code>main</code> and <code>branch_a</code> (after <code>branch_a</code> was created or after the last merge) are mutually exclusive, then git should be able to do this automatically. However, if the same file was modified in both branches, you will probably encounter this:</p>
<pre><code>CONFLICT (content): Merge conflict in my_file.txt
Automatic merge failed; fix conflicts and then commit the result.
</code></pre>
Expand All @@ -208,6 +208,22 @@ <h3 id="merging-branches"><a class="header" href="#merging-branches">Merging bra
<p>To resolve this, replace the text above with the final desired version (it could be one or the other, or a combination of both). Once you've resolved all of the conflicts in (and saved) each file, stage the files and create a new commit. This completes the merge process.</p>
<p>Afterwards, you may delete <code>branch_a</code>.</p>
<pre><code class="language-bash">git branch -d branch_a
</code></pre>
<h4 id="troubleshooting-merging-with-remote-branches"><a class="header" href="#troubleshooting-merging-with-remote-branches">Troubleshooting: Merging with remote branches</a></h4>
<pre><code>From github.com:gaverkov/mixed_volumes_proposal
* branch main -&gt; FETCH_HEA
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
</code></pre>

</main>
Expand Down
5 changes: 4 additions & 1 deletion cheat-sheet.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,10 @@ <h1 class="menu-title">The CPT&#x27;s Linux / Git Workshop</h1>

<div id="content" class="content">
<main>

<h1 id="cheat-sheet"><a class="header" href="#cheat-sheet">Cheat Sheet</a></h1>
<h2 id="basic-linux-commands"><a class="header" href="#basic-linux-commands">Basic Linux Commands</a></h2>
<h2 id="git-commands"><a class="header" href="#git-commands">Git commands</a></h2>

</main>

<nav class="nav-wrapper" aria-label="Page navigation">
Expand Down
25 changes: 22 additions & 3 deletions print.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ <h3 id="piping-examples"><a class="header" href="#piping-examples">Piping exampl
<p>Text is resource-light, enabling users to interact efficiently with programs even over slow network connections. The command structure was concise to minimize keystrokes, contributing to the continued popularity of text interfaces.</p>
<p>Unix users managed file operations such as creating, renaming, and organizing files using a textual interface. Each task required specific commands (e.g., <code>cd</code> for changing directories and <code>ls</code> for listing contents). These commands were coordinated by a master program known as the “shell,” which also allowed for command chaining and automation through shell scripts. The original Unix shell, <code>sh</code>, has evolved into modern shells like <code>bash</code>.</p>
<p>Linux is a descendant of Unix, designed to function similarly, allowing many old Unix programs to run effectively. While old terminals could connect to modern Linux systems, it is more common to use software terminals that provide a Unix-style text interface alongside graphical programs.</p>
<div style="break-before: page; page-break-before: always;"></div><h1 id="what-is-git"><a class="header" href="#what-is-git">What is Git?</a></h1>
<div style="break-before: page; page-break-before: always;"></div><h1 id="what-is-git"><a class="header" href="#what-is-git">What is git?</a></h1>
<p>Git is a version control system (VCS), which means that it saves, compares, and manages changes to files (usually code files) over time.</p>
<p>This may seem innocuous, but it's actually vital to the development cycle. Virtually all professional code is managed by some VCS, and git is by far the most common.</p>
<h2 id="use-cases"><a class="header" href="#use-cases">Use cases</a></h2>
Expand Down Expand Up @@ -625,7 +625,7 @@ <h3 id="merging-branches"><a class="header" href="#merging-branches">Merging bra
<p>and then run the <code>git merge</code> command.</p>
<pre><code class="language-bash">git merge branch_a
</code></pre>
<p>If the files modified in <code>main</code> and <code>branch_a</code> (after <code>branch_a</code> was created or after the last merge) are mutually exclusive, then git should be able to do this automatically. However, if the same file was modified in both branches, you probably encounter this:</p>
<p>If the files modified in <code>main</code> and <code>branch_a</code> (after <code>branch_a</code> was created or after the last merge) are mutually exclusive, then git should be able to do this automatically. However, if the same file was modified in both branches, you will probably encounter this:</p>
<pre><code>CONFLICT (content): Merge conflict in my_file.txt
Automatic merge failed; fix conflicts and then commit the result.
</code></pre>
Expand All @@ -640,7 +640,26 @@ <h3 id="merging-branches"><a class="header" href="#merging-branches">Merging bra
<p>Afterwards, you may delete <code>branch_a</code>.</p>
<pre><code class="language-bash">git branch -d branch_a
</code></pre>
<div style="break-before: page; page-break-before: always;"></div>
<h4 id="troubleshooting-merging-with-remote-branches"><a class="header" href="#troubleshooting-merging-with-remote-branches">Troubleshooting: Merging with remote branches</a></h4>
<pre><code>From github.com:gaverkov/mixed_volumes_proposal
* branch main -&gt; FETCH_HEA
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
</code></pre>
<div style="break-before: page; page-break-before: always;"></div><h1 id="cheat-sheet"><a class="header" href="#cheat-sheet">Cheat Sheet</a></h1>
<h2 id="basic-linux-commands"><a class="header" href="#basic-linux-commands">Basic Linux Commands</a></h2>
<h2 id="git-commands"><a class="header" href="#git-commands">Git commands</a></h2>

</main>

<nav class="nav-wrapper" aria-label="Page navigation">
Expand Down
2 changes: 1 addition & 1 deletion searchindex.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion searchindex.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion toc.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@
<!-- Custom theme stylesheets -->
</head>
<body class="sidebar-iframe-inner">
<ol class="chapter"><li class="chapter-item expanded affix "><a href="introduction.html" target="_parent">Introduction</a></li><li class="chapter-item expanded "><a href="ch1-linux.html" target="_parent"><strong aria-hidden="true">1.</strong> What is Linux?</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="ch1.1-linux-installation.html" target="_parent"><strong aria-hidden="true">1.1.</strong> How to Install Linux</a></li><li class="chapter-item expanded "><a href="ch1.2-linux-terminal.html" target="_parent"><strong aria-hidden="true">1.2.</strong> Using the Linux Terminal</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="ch1.2.1-putty.html" target="_parent"><strong aria-hidden="true">1.2.1.</strong> SSH on Windows using PuTTY</a></li><li class="chapter-item expanded "><a href="ch1.2.2-terminal-origins.html" target="_parent"><strong aria-hidden="true">1.2.2.</strong> Origin of the Linux Terminal</a></li></ol></li></ol></li><li class="chapter-item expanded "><a href="ch2-git.html" target="_parent"><strong aria-hidden="true">2.</strong> What is Git?</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="ch2.1-git-installation.html" target="_parent"><strong aria-hidden="true">2.1.</strong> How to Install git</a></li><li class="chapter-item expanded "><a href="ch2.2-using-git.html" target="_parent"><strong aria-hidden="true">2.2.</strong> Using git</a></li></ol></li><li class="chapter-item expanded "><li class="spacer"></li><li class="chapter-item expanded affix "><a href="cheat-sheet.html" target="_parent">Cheat Sheet</a></li></ol>
<ol class="chapter"><li class="chapter-item expanded affix "><a href="introduction.html" target="_parent">Introduction</a></li><li class="chapter-item expanded "><a href="ch1-linux.html" target="_parent"><strong aria-hidden="true">1.</strong> What is Linux?</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="ch1.1-linux-installation.html" target="_parent"><strong aria-hidden="true">1.1.</strong> How to Install Linux</a></li><li class="chapter-item expanded "><a href="ch1.2-linux-terminal.html" target="_parent"><strong aria-hidden="true">1.2.</strong> Using the Linux Terminal</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="ch1.2.1-putty.html" target="_parent"><strong aria-hidden="true">1.2.1.</strong> SSH on Windows using PuTTY</a></li><li class="chapter-item expanded "><a href="ch1.2.2-terminal-origins.html" target="_parent"><strong aria-hidden="true">1.2.2.</strong> Origin of the Linux Terminal</a></li></ol></li></ol></li><li class="chapter-item expanded "><a href="ch2-git.html" target="_parent"><strong aria-hidden="true">2.</strong> What is git?</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="ch2.1-git-installation.html" target="_parent"><strong aria-hidden="true">2.1.</strong> How to Install git</a></li><li class="chapter-item expanded "><a href="ch2.2-using-git.html" target="_parent"><strong aria-hidden="true">2.2.</strong> Using git</a></li></ol></li><li class="chapter-item expanded "><li class="spacer"></li><li class="chapter-item expanded affix "><a href="cheat-sheet.html" target="_parent">Cheat Sheet</a></li></ol>
</body>
</html>
2 changes: 1 addition & 1 deletion toc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class MDBookSidebarScrollbox extends HTMLElement {
super();
}
connectedCallback() {
this.innerHTML = '<ol class="chapter"><li class="chapter-item expanded affix "><a href="introduction.html">Introduction</a></li><li class="chapter-item expanded "><a href="ch1-linux.html"><strong aria-hidden="true">1.</strong> What is Linux?</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="ch1.1-linux-installation.html"><strong aria-hidden="true">1.1.</strong> How to Install Linux</a></li><li class="chapter-item expanded "><a href="ch1.2-linux-terminal.html"><strong aria-hidden="true">1.2.</strong> Using the Linux Terminal</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="ch1.2.1-putty.html"><strong aria-hidden="true">1.2.1.</strong> SSH on Windows using PuTTY</a></li><li class="chapter-item expanded "><a href="ch1.2.2-terminal-origins.html"><strong aria-hidden="true">1.2.2.</strong> Origin of the Linux Terminal</a></li></ol></li></ol></li><li class="chapter-item expanded "><a href="ch2-git.html"><strong aria-hidden="true">2.</strong> What is Git?</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="ch2.1-git-installation.html"><strong aria-hidden="true">2.1.</strong> How to Install git</a></li><li class="chapter-item expanded "><a href="ch2.2-using-git.html"><strong aria-hidden="true">2.2.</strong> Using git</a></li></ol></li><li class="chapter-item expanded "><li class="spacer"></li><li class="chapter-item expanded affix "><a href="cheat-sheet.html">Cheat Sheet</a></li></ol>';
this.innerHTML = '<ol class="chapter"><li class="chapter-item expanded affix "><a href="introduction.html">Introduction</a></li><li class="chapter-item expanded "><a href="ch1-linux.html"><strong aria-hidden="true">1.</strong> What is Linux?</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="ch1.1-linux-installation.html"><strong aria-hidden="true">1.1.</strong> How to Install Linux</a></li><li class="chapter-item expanded "><a href="ch1.2-linux-terminal.html"><strong aria-hidden="true">1.2.</strong> Using the Linux Terminal</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="ch1.2.1-putty.html"><strong aria-hidden="true">1.2.1.</strong> SSH on Windows using PuTTY</a></li><li class="chapter-item expanded "><a href="ch1.2.2-terminal-origins.html"><strong aria-hidden="true">1.2.2.</strong> Origin of the Linux Terminal</a></li></ol></li></ol></li><li class="chapter-item expanded "><a href="ch2-git.html"><strong aria-hidden="true">2.</strong> What is git?</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="ch2.1-git-installation.html"><strong aria-hidden="true">2.1.</strong> How to Install git</a></li><li class="chapter-item expanded "><a href="ch2.2-using-git.html"><strong aria-hidden="true">2.2.</strong> Using git</a></li></ol></li><li class="chapter-item expanded "><li class="spacer"></li><li class="chapter-item expanded affix "><a href="cheat-sheet.html">Cheat Sheet</a></li></ol>';
// Set the current, active page, and reveal it if it's hidden
let current_page = document.location.href.toString();
if (current_page.endsWith("/")) {
Expand Down

0 comments on commit 1dcd6eb

Please sign in to comment.