Skip to content

Commit 9bcac1a

Browse files
committed
📝 more hints on instructions
1 parent c3f2b8f commit 9bcac1a

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

instructions_241113.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ In order to commit this to the GitHub repository you have to do one of the two o
5151
- add all collaborators of your group to the repository (write access)
5252
- create a fork on your GitHub account
5353

54+
You can also mix both approaches in your group to find out about the differences.
55+
56+
> You can see how to commit changed files [here](https://www.youtube.com/watch?v=XolIezJtSPI&t=938s)
57+
> (in one part of the notes template hands on recording)
58+
5459
### 4. step - merge the branches to the main branch
5560

5661
On GitHub open a pull request to merge your branch to the main branch. We will explore
@@ -62,7 +67,7 @@ together some features of the pull request website.
6267
6368
### 5. step - view and annotate the collaborative work
6469

65-
Switch back to the `main` branch and get all the latest changes from your coworkers.
70+
Switch back to the `main` branch and get all the latest changes from your coworkers (pull).
6671
Now, each create (again) a new branch (pick a unique new name) and create a the file name `biosustain.md`.
6772
In this file write a about what you think biosustain is about.
6873

@@ -72,6 +77,9 @@ The first pull request will work fine. Everyone else has to deal with merge conf
7277
the same named file will be overwritten - and there is no clear way to say which version
7378
is the correct one or how to combine you changes.
7479

80+
- Hint: In your CodeSpace make sure to checkout the latest changes from the main branch
81+
before creating a new branch (pull on main).
82+
7583
### 7. step - merge conflicts
7684

7785
> Advanced!

0 commit comments

Comments
 (0)