- There are 2 tasks for this homework, one of you will do the one on branch `task1`, the other `task2`.
#### Scenario
We have a fancy recipe we want to cook but the text is not finished. Two cooks
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.
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.
Successful solution of this homework requires approval from your partner and
from a teacher.
- Pair with any student from your class. If you did a similar lab in a class, please switch roles and be Student #1 or #2 accordingly.
- Student #1 shares any git repo (any “Example”, but not Mastering git) with Student #2 and Irina/Tomas.
- Student #2 makes a contribution to an existing file inside Student's #1 git repo by opening a MR.
- Student #1 will push a change to the repo ("Example") that will cause a merge conflict in Student's #2 MR
- Student #2 resolves the merge conflict.
- After conflict is resolved, Student #1 asks to change something else in the MR. Based on a requested change, Student #2 needs to do a rebase again or add an additional commit.
- MR should be merged in the end and or rejected/closed if no positive value.
- Afterwards, Student #1 makes any contribution to their own (“Example”) repo via MR, and Student #2 needs to process it accordingly.
- Both students shall mind/practise/demonstrate best Git practices on commits and MR.
- All MRs during this HW should also contain a file (in a separate commit) with a shell history. In a case of rebase / new MR change, a new history file should be attached accordingly. So, in the end, each MR may contain several commits demonstrating git history.
- In a case of any troubles tag us on a MR to help, or just share what difficulties you had in MR conversations, so we can address the most common troubles on the last git class.
