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
Copy file name to clipboardExpand all lines: 01_version_control/git_exercise.md
+3-3Lines changed: 3 additions & 3 deletions
Original file line number
Diff line number
Diff line change
@@ -4,8 +4,8 @@ Deadline: **Wednesday, October 30, 2024, 9:00**
4
4
5
5
## Preparation
6
6
7
-
- Work on the exercises in groups of two. One of you creates a new organization on GitHub (free plan) and adds their partner.
8
-
- Import the [exercise repository](https://github.com/Simulation-Software-Engineering/git-exercise) and name it `git-exercise` again. We refer to this repository as the *upstream* repository.
7
+
- Work on the exercises in groups of two. One of you creates a new organization on GitHub (public, free plan) and adds their partner.
8
+
- Import the [exercise repository](https://github.com/Simulation-Software-Engineering/git-exercise) and name it `git-exercise` again. Make it public to get access to all features we need. We refer to this repository as the *upstream* repository.
9
9
- Add a branch protection rule for the `main` branch of the repository:
10
10
- Require a pull request before merging
11
11
- Require linear history
@@ -15,7 +15,7 @@ Deadline: **Wednesday, October 30, 2024, 9:00**
15
15
16
16
- There are three separate exercises. Each one consists of an individual Python file `exerciseX.py`. The exercises build upon each other, work from one to three. Each exercise is described in the comments at the top of the respective Python file.
17
17
- Each exercise has two tasks: A and B. Distribute the two tasks and **work on them in parallel**.
18
-
- For each task, create a new branch with an appropriate name (e.g., `ex-1-task-A`) and use appropriate commit messages (not `Solve task A`).
18
+
- For each task, create a new branch with an appropriate name (e.g., `ex-1-task-A`) and use appropriate commit messages (not `Solve task A`, but `Fix missing copy in Vector construction` or similar).
19
19
- When ready, push the new branch via `git push -u <remote> <branchname>` to your own remote and open a pull request to the `main` branch upstream (i.e. use the feature branch workflow, but with feature branches on forks).
20
20
- Assign your partner as reviewer. Review, fix problems, and eventually merge. For the best learning experience, use a different order of steps in every exercise.
21
21
-**Goal of the exercises**: Create a linear history with readable commit messages.
0 commit comments