How to use Git Conflict Trainer
Practice the mechanical and reasoning steps of a merge conflict with original, local text lessons. No repository is opened and no Git command is run.
- Read the lesson requirement and inspect our side and their side.
- Choose ours, theirs, both or a manual replacement for the next block.
- Check the full result against the requirement, then copy or export it.
A practical starting point
When two branches add independent list items, preserving both can be correct. When they change the same setting, choose the value that meets the review requirement.
<<<<<<< ours - Local drafts ======= - Portable exports >>>>>>> theirs
Common mistakes
- Removing markers does not establish that the content is correct.
- Accepting both can duplicate definitions or break syntax.
- Ours/theirs labels have different interpretations during a real rebase.
Frequently asked questions
Does the trainer modify my repository?
No. It edits browser-local lesson text only.
Is this a general merge engine?
No. It supports bounded two-sided marker blocks for teaching; nested and diff3 base markers are rejected.