Resolve "Rework episode 9 (conflicts)"

Closes #1 (closed)

added 1 commit

• f288abca - Add initial new version of the conflict episode

Compare with previous version

added 1 commit

• 2ca5fbca - Add initial episode content

Compare with previous version

added 1 commit

• af5351c0 - Fix CI build and a typo

Compare with previous version

@Dr4k3: Could you please have a look?

Looks fine. No remarks from my side.

added 1 commit

• 6c3a2e2d - Add improvements from the practical trial

Compare with previous version

added 1 commit

• 7ccdcc83 - Clarify section title

Compare with previous version

added 1 commit

• e7fdeb6a - Add a change to demonstrate auto-merging

Compare with previous version

Looks good to me, too. Fixed one typo, though

approved this merge request

unmarked as a Work In Progress

added 1 commit

• dd22c903 - Apply 1 suggestion(s) to 1 file(s)

Compare with previous version

enabled an automatic merge when the pipeline for dd22c903 succeeds

mentioned in commit 734358e2