schema: 1
card: console-bash/L07
title: Git Branching II — rebase and conflicts
steps:
  - id: rebase
    task: task01_rebase_deliberately
    action: test
    profile: native-amd64
    target: native
    command: stemctl test native-amd64 console-bash L07 1
    board:
      show: [old_feature_commit, main_tip, rewritten_feature_commit, parent]
      highlight: [new_base, changed_commit_id, linear_parent]
      question: Dlaczego commit po rebase ma inny hash mimo tej samej zmiany?
    evidence: [rewritten, parent_is_main, feature_ahead, linear]
  - id: conflict
    task: task02_resolve_conflict
    action: test
    profile: native-amd64
    target: native
    command: stemctl test native-amd64 console-bash L07 2
    board:
      show: [base_blue, main_red, feature_green, status_UU, resolution_purple]
      highlight: [conflict_markers, explicit_resolution, add_then_continue]
      question: Dlaczego Git nie może sam wybrać między red i green?
    evidence: [nonzero_rebase, UU_status, resolved_content, rebase_finished]
  - id: verify
    task: task03_verify_linear_history
    action: debug
    profile: native-amd64
    target: native
    command: stemctl debug native-amd64 console-bash L07 3
    board:
      show: [linear_log, subjects, merge_count, final_tree, clean_status, trace_log]
      highlight: [verification_after_resolution, no_merge_commit]
      question: Jak udowodnić, że rebase zakończył się poprawnie?
    evidence: [commit_count, subjects, merge_count, final_value, clean, trace_log]