[ad_1]

I have done something extremely stupid. I tried to fix some merge conflicts in Git, and I don’t know what I did, but I deleted my media folder (indirectly), in which I had all the images I needed for my website. I could’ve pulled from Git, except I can’t because .gitignore ignores the media folder. I have no idea what to do.

Here’s what I did:
I pulled from git, but it said error: Your local changes to the following files would be overwritten by merge. So I stashed my directory and then tried to pull again. Because of a few merge conflicts, I stashed, committed, and then tried to reset HEAD to the previous commit (I think this is where the folder got deleted) after git checkout -- ..

[ad_2]