Challenge 1
Complete the Git command to integrate the selected branch.
git topic
Press Ctrl⌘Enter to check your answer
Create a disposable repository with one common base commit, then create two branches that make incompatible edits to the same tracked file. Attempt the merge and collect evidence before changing anything. Record: the non-zero exit status; `git status --short --branch`; the current `HEAD`; `git rev-parse MERGE_HEAD`; every `git ls-files --unmerged` stage for the conflicting path; the working-tree conflict markers; and the parent list of `HEAD`. Your evidence must demonstrate that the branch tip did not become a new merge commit even though Git entered merge state. Do not resolve, continue, or abort the merge until all observations are recorded. Success requires a state table with separate columns for command result, working tree, index, HEAD, and merge metadata. The table must explicitly distinguish “conflict exists,” “merge is in progress,” and “merge commit does not yet exist.”
Challenge 1
git topic
Press Ctrl⌘Enter to check your answer
Challenge 2
git --short --branch
Press Ctrl⌘Enter to check your answer
Challenge 3
git MERGE_HEAD
Press Ctrl⌘Enter to check your answer
Challenge 4
git --unmerged
Press Ctrl⌘Enter to check your answer