Skip to content

Commit

Permalink
Changing mdslogo location
Browse files Browse the repository at this point in the history
  • Loading branch information
andytai7 committed Jul 25, 2024
1 parent e0edc5e commit 0642a34
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion _quarto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ website:
contents:
- text: |
<div style="text-align: center;">
<img src="lectures/img/MDSlogo.png" alt="MDS Logo" style="width: 100%; height: auto;">
<img src="/site_libs/img/MDSlogo.png" alt="MDS Logo" style="width: 100%; height: auto;">
</div>
- text: "Lecture 0: JupyterLab Orientation"
href: lectures/0-jupyterlab-orientation-intro.qmd
Expand Down
2 changes: 1 addition & 1 deletion docs/lectures/0-jupyterlab-orientation-intro.html
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
<ul class="list-unstyled mt-1">
<li class="sidebar-item">
<span class="menu-text"><div style="text-align: center;">
<img src="lectures/img/MDSlogo.png" alt="MDS Logo" style="width: 100%; height: auto;">
<img src="../site_libs/img/MDSlogo.png" alt="MDS Logo" style="width: 100%; height: auto;">
</div>
</span>
</li>
Expand Down
2 changes: 1 addition & 1 deletion docs/lectures/1-MDStools-bash-filesystem.html
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
<ul class="list-unstyled mt-1">
<li class="sidebar-item">
<span class="menu-text"><div style="text-align: center;">
<img src="lectures/img/MDSlogo.png" alt="MDS Logo" style="width: 100%; height: auto;">
<img src="../site_libs/img/MDSlogo.png" alt="MDS Logo" style="width: 100%; height: auto;">
</div>
</span>
</li>
Expand Down
2 changes: 1 addition & 1 deletion docs/lectures/2-git-github-ssh-basic-workflow.html
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
<ul class="list-unstyled mt-1">
<li class="sidebar-item">
<span class="menu-text"><div style="text-align: center;">
<img src="lectures/img/MDSlogo.png" alt="MDS Logo" style="width: 100%; height: auto;">
<img src="../site_libs/img/MDSlogo.png" alt="MDS Logo" style="width: 100%; height: auto;">
</div>
</span>
</li>
Expand Down
4 changes: 2 additions & 2 deletions docs/lectures/3-git-history-merge-conflicts-stash.html
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
<ul class="list-unstyled mt-1">
<li class="sidebar-item">
<span class="menu-text"><div style="text-align: center;">
<img src="lectures/img/MDSlogo.png" alt="MDS Logo" style="width: 100%; height: auto;">
<img src="../site_libs/img/MDSlogo.png" alt="MDS Logo" style="width: 100%; height: auto;">
</div>
</span>
</li>
Expand Down Expand Up @@ -393,7 +393,7 @@ <h1>3. Deal with merge conflicts at the command line</h1>
<li><p>Place 2: Changes to a document where the same line(s) are modified (Git CANNOT automatically merge these and will complain that you have a “merge conflict” when you <code>pull</code>).</p></li>
</ul>
<p>In the second case, you have to help git by telling it which changes you want to keep. Git kindly points you to where the problem is in the output from <code>git pull</code> where it mentions which files have been modified from two source. You will need to edit this file to make it look how you want and then <code>add</code> it to the staging area and <code>commit</code>.</p>
<p><img src="img/fetchvspull.png" class="img-fluid figure-img"></p>
<p><img src="img/fetchvspull.png" class="img-fluid"></p>
<section id="how-do-you-know-you-have-a-merge-conflict" class="level2">
<h2 class="anchored" data-anchor-id="how-do-you-know-you-have-a-merge-conflict">How do you know you have a merge conflict?</h2>
<p>If you have committed some changes locally, you might see something like this when you try to <code>push</code> them:</p>
Expand Down
File renamed without changes

0 comments on commit 0642a34

Please sign in to comment.