One bad merge wiped out a whole week of work, here is what saved me

Last Tuesday I was working on a small project for a client and did a git merge without checking the branch first. Long story short, I overwrote 3 days of changes and spent the next 5 hours trying to undo it. The only reason I got it back was because I had made a backup zip file on a USB stick the night before, something I had never done before. My mentor always said commit early and commit often, but I thought I was being careful. Has anyone else had a merge disaster that taught them a lesson the hard way? What do you do now to prevent it?

0 comments

0 Comments

No comments yet

Be the first to share your thoughts on this discussion.