Skip to content

Commit

Permalink
lab 9 edits and adding to the index
Browse files Browse the repository at this point in the history
  • Loading branch information
Ahmed El Deeb authored and Ahmed El Deeb committed Nov 3, 2023
1 parent 33d9584 commit f5c541c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 28 deletions.
2 changes: 2 additions & 0 deletions _quarto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ website:
text: "Lab 6: SCF and Parallel Computing"
- file: labs/py_vs_R.qmd
text: "Lab 7: R vs. Python"
- file: labs/09/collab_with_git.md
text: "Lab 9: Collaboration with Git"
- id: howtos
title: "How tos"
contents:
Expand Down
31 changes: 3 additions & 28 deletions labs/09/collab_with_git.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "Collaboration with Git"
author: "Zoey Vernon, Andrew Vaughn, James Duncan"
author: "Zoey Vernon, Andrew Vaughn, James Duncan, Ahmed Eldeeb"
date: "2022-11-04"
format:
pdf:
Expand Down Expand Up @@ -47,36 +47,11 @@ We'll work in pairs to practice collaboration with Git and how to fix issues
that can arise when working in a shared Git repo.


## Warm up exercises: Pair introductions & reading

We'll start by learning a bit about each other and our previous experience with
Git. Click to expand the blocks below.

:::{.callout-note collapse="true"}
## Exercise 0.a (~3 minutes)

1. Briefly introduce yourself to your pair (name / academic program).
1. On your own, answer the following questions (yes / no):
a. Did you have any experience using Git before this class? (y = 1 / n = 0)
b. Have you ever used a shared GitHub repo for a collaborative project? (y =
1 / n = 0)
c. Have you ever fixed a merge conflict? If you're not sure, you
can answer "no". (y = 2 / n = 0)
1. Tally your answers using the values I gave for each question so that you get
a number between 0 and 4. (_NB: Your score carries NO judgment. After this
course, each and every one of you will have a 4._)
1. Show your total to your pair.
a. If you both have 0 or you both have 3 or above, please **raise your hands
and keep them raised**. Don't worry, the class will assume you have >= 3!
b. Otherwise, move on to the next section.

:::

Next, we'll do some reading to get familiar with Git and GitHub's main features
First, we'll do some reading to get familiar with Git and GitHub's main features
that facilitate collaboration.

:::{.callout-note collapse="true"}
## Exercise 0.b (~10 minutes)
## Exercise 0 (~10 minutes)

Before working on the rest of the pair exercises, we'll read through the
sections below. Much of the content is just examples of usage for different
Expand Down

0 comments on commit f5c541c

Please sign in to comment.