Loading README.md +8 −6 Original line number Diff line number Diff line Loading @@ -156,7 +156,7 @@ approved. **Deadline**: 1. April 2025, 23:59 - Pair with any student from your class. - There are 2 tasks for this homework, one of you will do the one on branch `task1`, the other `task2`. - There are 2 tasks for this homework, one of you will do the one on branch `hw05-task1`, the other `hw05-task2`. #### Scenario We have a fancy recipe we want to cook but the text is not finished. Two cooks Loading @@ -164,14 +164,16 @@ tried to complete it in their own git branches, but left a mess in their git history. Please help them out. 1. Use `git rebase -i` to tidy the history and improve commit messages 2. Make sure rebases and merge conflicts are solved properly. 3. The commit history follows best practices from the class. 4. The content of the commits follows best practices from the class. Your task is to pick either `task1` branch or `task2`, fix it, open a merge request against branch `recipe-bad` and let your partner review it. You can create those merge requests on this upstream repo. If you choose your forks, please email us links to those merge requests. Your task is to pick either `hw05-task1` branch or `hw05-task2`, fix it, open a merge request against branch `hw05-base` and let your partner review it. You can create those merge requests on this upstream repo. If you choose your forks, please email us links to those merge requests. Successful solution of this homework requires approval from your partner and from a teacher. from a teacher. Your partner can ask you to do changes in the MR! ### Class 6 homework Loading Loading
README.md +8 −6 Original line number Diff line number Diff line Loading @@ -156,7 +156,7 @@ approved. **Deadline**: 1. April 2025, 23:59 - Pair with any student from your class. - There are 2 tasks for this homework, one of you will do the one on branch `task1`, the other `task2`. - There are 2 tasks for this homework, one of you will do the one on branch `hw05-task1`, the other `hw05-task2`. #### Scenario We have a fancy recipe we want to cook but the text is not finished. Two cooks Loading @@ -164,14 +164,16 @@ tried to complete it in their own git branches, but left a mess in their git history. Please help them out. 1. Use `git rebase -i` to tidy the history and improve commit messages 2. Make sure rebases and merge conflicts are solved properly. 3. The commit history follows best practices from the class. 4. The content of the commits follows best practices from the class. Your task is to pick either `task1` branch or `task2`, fix it, open a merge request against branch `recipe-bad` and let your partner review it. You can create those merge requests on this upstream repo. If you choose your forks, please email us links to those merge requests. Your task is to pick either `hw05-task1` branch or `hw05-task2`, fix it, open a merge request against branch `hw05-base` and let your partner review it. You can create those merge requests on this upstream repo. If you choose your forks, please email us links to those merge requests. Successful solution of this homework requires approval from your partner and from a teacher. from a teacher. Your partner can ask you to do changes in the MR! ### Class 6 homework Loading
