Skip to content

Commit 6af717e

Browse files
committed
update readme
1 parent 586f054 commit 6af717e

1 file changed

Lines changed: 2 additions & 15 deletions

File tree

README.md

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# OceanHackWeek 2026 — Intro to Git & GitHub
22

33
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.
55

66
> Adapted from the [OHW22 NE intro activity](https://github.com/oceanhackweek/ohw22-NE-intro-activity)
77
> 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
1414

1515
## Resources
1616

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
1818
log in to our hub (CryoCloud) and set up git auth, use [SETUP.md](SETUP.md),
1919
which is current for OHW26.
2020

@@ -47,19 +47,6 @@ run `git status`.
4747

4848
---
4949

50-
## One-time git setup (skip if you already did this)
51-
52-
```bash
53-
git config --global user.name "Your Name"
54-
git config --global user.email "the-email-you-used-for-github@example.com"
55-
git config --global pull.rebase false # <-- confirm value for OHW26 (see SETUP.md)
56-
git config --global init.defaultBranch main
57-
```
58-
59-
Check it: `git config --list`
60-
61-
---
62-
6350
## Round 0 — open your intro issue
6451

6552
On this repo's **Issues** tab, click **New issue**. Title it

0 commit comments

Comments
 (0)