Hw04 (class05): task2

Goal: fix git history of cook #2 and improve the file recipe.md

Most prominent changes to git history:

• removed an empty commit
• squashed semantically similar commits (in effect, this also removed commits 1d37dcc8 and 3a77f767)
• removed an unrelated commit (2e771d96)

Most prominent changes to file content:

• removed merge artifacts from recipe.md
• fixed two additional typos in recipe.md

Great job fixing the not-so-great git history! I like the title and the description, they are very descriptive.

One thing I'd maybe point out is that both of the commits fix the same type of things, and also, their commit message is almost identical, so it might be a good idea to squash them together as well.

Otherwise LGTM.

Hi @xmarcin3 , thanks for your feedback :)

Yes, I agree that the two commits look like they should be squashed. The reason why I kept them separate is because one only contains changes made by cook #2 (Bella Dessertqueen) and the other one only contains my changes. It seems reasonable to me not to squash commits from different authors, but I've never encountered such a situation before, so I am not sure how to solve it. Is it better to squash the commits? Or to indicate the authors in commit messages? Or is the current state (when the authors can be read in commit "metadata") OK?

I'd love to hear your opinion on that, as well as the opinions of Michal and Tomas.

I haven't encountered a situation like this before either, so this is only my opinion. However, since the changes are so small and only related to typos, I don't think the authorship is too important here, and the commits can be squashed.

In real world, you typically want to preserve commits from external contributors without touching them, and, thus, keep their authorship intact. If the commit was made by your team member (who is not a drama queen) then it does not matter, clean history is the best history 😁

added 1 commit

• b26558fd - Correct typos and formatting in recipe.md

Compare with previous version

@xmarcin3 The history is now fixed as you suggested :)

@xdupkan Hello. Thank you for your contribution, I approve.

Beware, that your commit messages do not contain a proper body documenting what changes are made and why. In the scope of this homework, such details are negligible, however, beware that in real world projects your work might not be merged into the main branch because of such details.

approved this merge request

added Teacher approved label