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 t...