My first git merge went so bad I had to start the project over from scratch

2 comments

2 Comments

Used to think people who screwed up their git repos just weren't paying attention. Then I had a merge with a messy branch I hadn't touched in weeks. Ended up with conflicts in config files, overwritten changes, and a tree that just wouldn't resolve. Had to scrap the whole branch and manually redo all my work from a clean copy. That one day of misery changed my whole view on version control.

christophermurray5d ago

Used to be exactly the same way. Judged people hard when they talked about losing work in git. Thought they just weren't careful enough or skipped the basics. Then I had a merge from hell that took me two days to sort out. Had conflicts everywhere and kept making it worse trying to fix things. Completely humbled me. Now I get why people have horror stories.