feat(L06): add Git branch switch and merge card

2026-07-21 18:08:33 +02:00
commit de2f7f2fed
38 changed files with 7147 additions and 0 deletions
@@ -0,0 +1,37 @@
+schema: 1
+card: console-bash/L06
+title: Git Branching I — branch, switch and merge
+steps:
+  - id: create-switch
+    task: task01_create_and_switch
+    action: test
+    profile: native-amd64
+    target: native
+    command: stemctl test native-amd64 console-bash L06 1
+    board:
+      show: [base_commit, main_ref, feature_ref, head]
+      highlight: [branch_is_ref, switch_moves_head]
+      question: Czy utworzenie gałęzi kopiuje wszystkie pliki?
+    evidence: [branch_names, current_branch, shared_commit]
+  - id: diverge
+    task: task02_divergent_work
+    action: test
+    profile: native-amd64
+    target: native
+    command: stemctl test native-amd64 console-bash L06 2
+    board:
+      show: [merge_base, main_commit, feature_commit, ahead_counts]
+      highlight: [common_ancestor, independent_changes]
+      question: Dlaczego żadna gałąź nie zawiera jeszcze zmiany drugiej?
+    evidence: [merge_base, main_ahead, feature_ahead, files]
+  - id: merge
+    task: task03_merge_completed_work
+    action: debug
+    profile: native-amd64
+    target: native
+    command: stemctl debug native-amd64 console-bash L06 3
+    board:
+      show: [main, feature, merge_commit, parents, result_tree, trace_log]
+      highlight: [no_ff, two_parents, integrated_tree]
+      question: Co oznaczają dwaj rodzice merge commita?
+    evidence: [parent_count, commit_count, both_files, clean, trace_log]