Branches, merging, and conflicts

What you will build

Experiment on a branch and resolve a real text conflict.

Understand the idea first

Experiment on a branch and resolve a real text conflict.

Build it step by step

git switch -c feat/progress-filter
# edit and commit
git switch main
git merge feat/progress-filter

1. Open the previous project and record its result.
2. Type the example and complete: Modify the same line on two branches, resolve the conflict, and run the page.
3. Change one input, predict, then verify.
4. Create and repair: Never commit conflict markers; edit the intended final content.

Read the important lines

• Experiment on a branch and resolve a real text conflict.
• Read input, processing, and output separately.
• Verify another input and an edge case.

Common mistakes and what to check

Practice without copying

Modify the same line on two branches, resolve the conflict, and run the page.

Completion check

• I produced the required visible result
• I can explain the input, processing, and output
• I tested normal, edge, and failure cases