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
[here](https://docs.github.com/en/repositories/creating-and-managing-repositories/creating-a-repository-from-a-template#creating-a-repository-from-a-template) or
33
-
[the demo-recording](https://youtu.be/XolIezJtSPI?t=98) to use it.
[here](https://docs.github.com/en/repositories/creating-and-managing-repositories/creating-a-repository-from-a-template#creating-a-repository-from-a-template) or
35
+
[the demo-recording](https://youtu.be/XolIezJtSPI?t=98) to use it.
34
36
35
37
### 2. step - create a clone of the shared repository
36
38
37
-
Now you have a common repository you can share with each others. You can either
39
+
Now you have a common repository you can share with each others. You can either
38
40
[work in a codespace](https://docs.github.com/en/codespaces/developing-in-a-codespace/creating-a-codespace-for-a-repository#creating-a-codespace-for-a-repository)
39
41
(opening the repository in a virtual machine in the browser) or clone the repository
40
42
to your local machine.
41
43
42
-
- we won't cover the website aspect of the template here, but I created a video on how
43
-
to use the template for a website [here](https://www.youtube.com/watch?v=XolIezJtSPI)
44
+
- we won't cover the website aspect of the template here, but I created a video on how
45
+
to use the template for a website [here](https://www.youtube.com/watch?v=XolIezJtSPI)
44
46
(which is also linked in the [repository's README](https://github.com/enryH/notes_template)).
45
47
46
48
### 3. step - each create a branch
47
49
48
-
Each of you create a branch, e.g. give it your name. Add a brief description of what you
50
+
Each of you create a branch, e.g. give it your name. Add a brief description of what you
49
51
are passionate about in a file called `aboutme.md` in a folder with your name.
50
52
51
53
In order to commit this to the GitHub repository you have to do one of the two options:
@@ -61,7 +63,7 @@ You can also mix both approaches in your group to find out about the differences
61
63
62
64
### 4. step - merge the branches to the main branch
63
65
64
-
On GitHub open a pull request to merge your branch to the main branch. We will explore
66
+
On GitHub open a pull request to merge your branch to the main branch. We will explore
65
67
together some features of the pull request website.
66
68
67
69
> Hint: Use the extension
@@ -70,28 +72,26 @@ together some features of the pull request website.
70
72
71
73
### 5. step - view and annotate the collaborative work
72
74
73
-
Switch back to the `main` branch and get all the latest changes from your coworkers (pull).
74
-
Now, each create (again) a new branch (pick a unique new name) and create a the file name `biosustain.md`.
75
+
Switch back to the `main` branch and get all the latest changes from your coworkers (pull).
76
+
Now, each create (again) a new branch (pick a unique new name) and create a the file name `biosustain.md`.
75
77
In this file write a about what you think biosustain is about.
76
78
77
79
### 6. step - merge the branches to the main branch
78
80
79
-
The first pull request will work fine. Everyone else has to deal with merge conflicts, as
80
-
the same named file will be overwritten - and there is no clear way to say which version
81
+
The first pull request will work fine. Everyone else has to deal with merge conflicts, as
82
+
the same named file will be overwritten - and there is no clear way to say which version
81
83
is the correct one or how to combine you changes.
82
84
83
-
- Hint: In your CodeSpace make sure to checkout the latest changes from the main branch
85
+
- Hint: In your CodeSpace make sure to checkout the latest changes from the main branch
84
86
before creating a new branch (pull on main).
85
87
86
88
### 7. step - merge conflicts
87
89
88
90
> Advanced!
89
91
90
-
We will explore how to resolve merge conflicts in VSCode's UI. This is advanced and
92
+
We will explore how to resolve merge conflicts in VSCode's UI. This is advanced and
91
93
you don't have to do this for now.
92
94
93
95
## Follow up recording
94
96
95
-
[](https://www.youtube.com/watch?v=mX3Il5xvKAs)
97
-
97
+
[](https://www.youtube.com/watch?v=mX3Il5xvKAs)
- Open in GitHub Codespace if you want to build and preview the website without
25
+
- Open in GitHub Codespace if you want to build and preview the website without
25
26
creating a commit:
26
27
27
28
[](https://github.com/codespaces/new?hide_repo_select=true&ref=main&repo=1053356553&skip_quickstart=true)
28
29
29
30
### On local computer
30
31
31
-
Install both an editor, e.g. [VSCode](https://code.visualstudio.com/download) (recommended),
32
+
Install both an editor, e.g. [VSCode](https://code.visualstudio.com/download) (recommended),
32
33
and the command line program [git](https://git-scm.com/install/)
33
34
34
35
## Exercises
@@ -37,17 +38,17 @@ Choose your favrioute.
37
38
38
39
### Add your recipe and request a review [basic]
39
40
40
-
> This I have to test with someone
41
+
> This I have to test with someone
41
42
42
-
-[create a fork](https://github.com/enryH/recipe-book/fork)
43
+
-[create a fork](https://github.com/enryH/recipe-book/fork)
43
44
(or request access as collaborator of the the recipe-repo)
44
-
- add and commit your recipe. The next two steps can be done either as first or
45
+
- add and commit your recipe. The next two steps can be done either as first or
45
46
second, why?
46
47
- create a branch with your new recipe, e.g. `add-aioli-pasta`
47
48
- create a commit with your new recipe draft
48
49
- open a Pull (Merge) Request on GitHub to `origin/main`
49
50
- ask someone (by inviting them) to review your PR and get an approval
50
-
- I set-up the repo to require at least one approval before a merge is possible
51
+
- I set-up the repo to require at least one approval before a merge is possible
51
52
(best-practice)
52
53
53
54
### Create a merge conflict [medium]
@@ -59,15 +60,16 @@ Work simulatenously on the same files, writing new content to the same sections
59
60
- everyone after has to resolve merge conflicts as the changes are not easy to resolve
60
61
automatically (draw out the graph to see why)
61
62
62
-
63
63
How to merge:
64
-
- Open a GitHub PR, follow the instructions there
65
-
(see [Web-Editor](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github))
66
-
- too large differences have to resolved locally, e.g. using the
67
-
[VSCode Merge Editor](https://code.visualstudio.com/docs/sourcecontrol/overview). See
(see [Web-Editor](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github))
67
+
- too large differences have to resolved locally, e.g. using the
68
+
[VSCode Merge Editor](https://code.visualstudio.com/docs/sourcecontrol/overview). See
0 commit comments