My first git merge turned into a 3 hour panic in Portland

I finally got my little project running last Tuesday and thought I was hot stuff. Then I tried to merge my branch into main and everything just exploded with conflicts I did not understand at all. I spent like 3 hours googling error messages and almost deleted my whole repo out of pure frustration. Ended up just copying my files to a USB and starting over, which felt dumb but got the job done. Has anyone else nuked their work when learning git or did I miss some obvious trick?

1 comments

Log in to join the discussion

Log In

1 Comment

evan5437d ago

Copying to USB was the right call honestly.

1