Intermediate
Resolve a merge conflict
Two branches changed the same file. Merge them and resolve the conflict.
Goal
Merge a branch, resolve the conflict, and complete the merge.
Available commands
Hints
- Stuck? Reveal a hint — no penalty.
Empty folder
Run git init to create a repository.
bash — gitscope
GitScope terminal — a safe Git simulation.
Try: git init
$
Working directory
Clean — no uncommitted changes.
git add ↓
Staging area
Nothing staged. Run git add.
git commit ↓
Repository
No commits yet.