Skip to content

Add minor remarks in Git exercise #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions 01_version_control/git_exercise.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Deadline: **Wednesday, October 30, 2024, 9:00**

## Preparation

- Work on the exercises in groups of two. One of you creates a new organization on GitHub (free plan) and adds their partner.
- 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.
- Work on the exercises in groups of two. One of you creates a new organization on GitHub (public, free plan) and adds their partner.
- 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.
- Add a branch protection rule for the `main` branch of the repository:
- Require a pull request before merging
- Require linear history
Expand All @@ -15,7 +15,7 @@ Deadline: **Wednesday, October 30, 2024, 9:00**

- 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.
- Each exercise has two tasks: A and B. Distribute the two tasks and **work on them in parallel**.
- 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`).
- 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).
- 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).
- 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.
- **Goal of the exercises**: Create a linear history with readable commit messages.
Expand Down
Loading