You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: README.md
+2-15Lines changed: 2 additions & 15 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -1,7 +1,7 @@
1
1
# OceanHackWeek 2026 — Intro to Git & GitHub
2
2
3
3
An introduction to git and GitHub. Everyone works in this repository at the same time.
4
-
We are going to make a few merge conflicts happen here, we're going to practice resolving them here, so you already know what to do when they show up later in the week.
4
+
We're going to make a few merge conflicts happen on purpose and practice resolving them, so you already know what to do when they show up later in the week.
5
5
6
6
> Adapted from the [OHW22 NE intro activity](https://github.com/oceanhackweek/ohw22-NE-intro-activity)
7
7
> by Catherine Mitchell, itself heavily borrowed from Alex Kerney's
@@ -14,7 +14,7 @@ We are going to make a few merge conflicts happen here, we're going to practice
14
14
15
15
## Resources
16
16
17
-
Background reading from the OHW site. These are general references for how to
17
+
Background reading from the OHW site. These are general references. For how to
18
18
log in to our hub (CryoCloud) and set up git auth, use [SETUP.md](SETUP.md),
19
19
which is current for OHW26.
20
20
@@ -47,19 +47,6 @@ run `git status`.
47
47
48
48
---
49
49
50
-
## One-time git setup (skip if you already did this)
0 commit comments