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
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.**
43
43
```
44
44
45
-
46
45
### 1. Create a project repository
47
46
48
47
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
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.
68
67
69
68
### 3. Update the README with your name
70
69
@@ -82,7 +81,6 @@ Make sure your change appears online.
82
81
`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`.
83
82
```
84
83
85
-
86
84
### 4. Update your local repository (local clone) with the changes of your collaborators
87
85
88
86
```bash
@@ -140,7 +138,6 @@ You can continue working on as usual.
140
138
... to avoid messing with complicated merges and keep your repo up-to-date.
141
139
```
142
140
143
-
144
141
### 6. Avoiding problems: forking workflow
145
142
146
143
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
242
239
Your files in the local repo will still be there.
243
240
```
244
241
242
+
245
243
## References and Resources
246
244
247
245
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