

0 / 2 embers
0 / 3000 xp
click for more info
Complete a lesson to start your streak
click for more info
Still calibrating
click for more info
Not enough gems
Cost: 6 gems
1: Conflicting Changes
incomplete
2: Merge Conflicts
incomplete
3: Merge
incomplete
4: Edit the File
incomplete
5: Resolution
incomplete
6: Conflict Quiz
incomplete
7: Back to Main
incomplete
8: Back to Main
incomplete
9: Ours and Theirs
incomplete
10: Multi-conflict
incomplete
11: Checkout Conflict
incomplete
12: No Merge Commits
incomplete
Back
ctrl+,
Next
ctrl+.
This lesson's interactive features are locked, please to keep using them
You just ran a git merge and now are facing a conflict:
<<<<<<< HEAD
count = 1
count += 1
=======
count = 2
count++
>>>>>>> main