Almost lost all my work with a rebase

So that was a fun thing to experience. Apparently another dev made changes to a file that I previously made changes in. I wanted to switch to Ashley’s branch to test her PR and couldn’t until I committed those changes (that I didn’t make). Well one thing led to another and I tried to rebase and the patch kept failing. So I followed the instructions, committed again and did a rebase continue. Well the patch didn’t work again so I did a rebase skip and all of a sudden all the files I created and changes I made in the ticket I was working on were gone. Panic.

I pinged Rachel and she replied with “Oh dear!” Kinda like saying “rookie”.

Needless to say I’m gonna be more careful next time. Even though I was pretty careful this time. Now extraaaaaaaaa careful