Git Flow · Level 3
Untangling
Mission briefing
Mission 1-C: Two engineers worked on the same token file at the same time. Neither of them knew. Now the repo is flagging a conflict, and someone has to untangle it. That someone is on your team.
We've got a merge conflict on colors.json. Two branches updated the same line — one changed primary-blue to #0057FF, the other to #004EEB. Git doesn't know which one to keep. A human has to decide.
Also — I noticed your node_modules folder almost got committed. Make sure that's in the .gitignore file. That folder is massive and auto-generated — it should never live in the repo.
And if you ever commit something you didn't mean to — a wrong file, a broken change — git revert is your friend. It doesn't delete history. It creates a new commit that undoes the damage. Clean, traceable.
You committed a font file (34MB) to the repo by mistake. It's already pushed. What do you do?