Bjarke Sporring 8a82253fc2 fix: add better explanation of merges

2026-01-15 14:22:11 +01:00

..

01-basics

feat: make the steps more explicit

2026-01-15 11:45:58 +01:00

02-history

fix: verification of answers for history

2026-01-15 12:01:07 +01:00

03-branching-and-merging

fix: add better explanation of merges

2026-01-15 14:22:11 +01:00

04-merge-conflict

refactor: we're breaking out merge-conflicts

2026-01-15 12:51:43 +01:00

05-cherry-pick

refactor: we're breaking out merge-conflicts

2026-01-15 12:51:43 +01:00

06-revert

refactor: we're breaking out merge-conflicts

2026-01-15 12:51:43 +01:00

07-reset

refactor: we're breaking out merge-conflicts

2026-01-15 12:51:43 +01:00

08-stash

refactor: we're breaking out merge-conflicts

2026-01-15 12:51:43 +01:00

09-multiplayer

refactor: we're breaking out merge-conflicts

2026-01-15 12:51:43 +01:00