Commit c7278174 authored by Vojtěch Trefný's avatar Vojtěch Trefný
Browse files

Merge branch 'main' into 'main'

HW02 + HW03: Add journal entry for 13.03.2026

See merge request red-hat/mastering-git!116
parents 42e5457b a7f437ff
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -7,3 +7,8 @@ I worked on my Git homework today. I'll submit it in a bit, and then it'll be do

Dear Diary,
Today I learned about merge conflicts in Git. They seem scary but I think I can handle them. Wish me luck!

# 13.03.2026

Dear Diary,
Today wasn't very interesting, but I did go for a walk in the park. I also traveled home by train, which was delayed by 20 minutes for some reason, but I didn't mind too much.