

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
Your manager at MegaCorp™ is not happy. Turns out, you were never supposed to add a customer to the all.csv file at all. Only Greg is allowed to do that. Stupid Greg.
This is what you get for making a change without 10 design meetings and an "alignment of stakeholders". What were you expecting, to be productive? This is MegaCorp™. Process over productivity, get back in line.
Let's fix our hastiness by doing a reset --hard of the merge commit, this will allow us to take a different approach to resolving the conflict.
Luckily, we haven't borked main yet, we just need to fix our add_customers branch.
Run and submit the CLI tests.