Rant: Git merge hell after a team push at the hackathon last Friday

I was working on a group project at the Seattle Hackathon last Friday, and we all pushed our code to the same branch at the same time. Ended up with 43 merge conflicts and no one knew how to fix them. We lost 2 hours just untangling the mess. Has anyone else had a team project go sideways because nobody used branches right?

2 comments

2 Comments

karent751mo ago

Nah, merging is a skill you learn by doing. That hackathon taught you a lesson.

faith_thomas1mo ago

Wait what @karent75. You actually learned this at a hackathon? That's wild. First merge in a real repo is always terrifying.