Skip to content

Commit c0601f5

Browse files
committed
Small polish to Git Prep doc
1 parent 0d78592 commit c0601f5

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

resources/prep/git.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ git config --global core.editor "nano -w"
4242
Steps 1-5 focus on the Git "centralized workflow". We present it here as an illustration, but **the workflow we recommend for use in OceanHackWeek is the Git Fork - Clone workflow, discussed in Step 6.**
4343
```
4444

45-
4645
### 1. Create a project repository
4746

4847
On your own or someone in your project group (preferably one who has never done it before), create a repository for the project under the `oceanhackweek` organization, `https://github.com/oceanhackweek`
@@ -64,7 +63,7 @@ Each participant should clone the repository so they have their copy on their Ju
6463
git clone https://github.com/oceanhackweek/ohw22-proj-myprojectname.git
6564
```
6665

67-
This will create a new folder called `ohw22-proj-myprojectname`. Navigate to the new folder, `ohw22-proj-myprojectname`.
66+
This will create a new folder called `ohw22-proj-myprojectname`. Navigate (`cd`) to this new folder.
6867

6968
### 3. Update the README with your name
7069

@@ -82,7 +81,6 @@ Make sure your change appears online.
8281
`git status` to observe the changes made into your repository. Pay attention to the colors. To see the changes in the files run `git diff`.
8382
```
8483

85-
8684
### 4. Update your local repository (local clone) with the changes of your collaborators
8785

8886
```bash
@@ -140,7 +138,6 @@ You can continue working on as usual.
140138
... to avoid messing with complicated merges and keep your repo up-to-date.
141139
```
142140

143-
144141
### 6. Avoiding problems: forking workflow
145142

146143
So far you collaborated using what is called a "centralized git workflow": i.e. every collaborator makes directly changes to the repo.
@@ -242,6 +239,7 @@ git revert HEAD
242239
Your files in the local repo will still be there.
243240
```
244241

242+
245243
## References and Resources
246244

247245
Git and GitHub are very powerful tools but no doubt the learning curve is steep. Learning is an iterative process so below we list some resources which can help you be better prepared:

0 commit comments

Comments
 (0)