> git merge
_
Resolve conflicts correctly before time runs out.
npm start
cat leaderboard.txt
> git help merge
git continue
Level:
1
Score:
0
Time:
60
s
Goal:
src/main.js
Accept Current
Accept Incoming
Accept Both
Manual Edit
Save & Resolve
MERGE FAILED
git push
git reset --hard
🏆 High Scores
:q!