🕷🤖🐷Samantha Ghraves💜♠️💚 @spiderrobotpig@awoo.space

@vahnj Okay, I did that

@vahnj Okay, I will do this instead

@vahnj Now it's saying the cherry-pick is empty.

Let me go further back

@vahnj On branch master
Your branch is up-to-date with 'origin/master'.
You are currently cherry-picking commit 3f965c5.

nothing to commit, working directory clean
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

git commit --allow-empty

Otherwise, please use 'git reset'

@vahnj Yeah, I had to modify win95.scss to make the webpacker do anything.

So, fixing the issue I get

@vahnj Oh wait I think I see what happened, gimmie a sec

@vahnj That's what I get

@vahnj On branch awoo-master
Your branch is ahead of 'awoo/master' by 1 commit.
(use "git push" to publish your local commits)
You are currently cherry-picking commit 3f965c5.

Changes not staged for commit:
modified: app/javascript/styles/win95.scss

no changes added to commit
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

git commit --allow-empty

Otherwise, please use 'git reset'

@vahnj I can restore the site from backup, but I don't know what that's gonna do to the repo at this point

@vahnj Yes.

How bad did I fuck up, tell it to me straight doc

@vahnj Also, the site being up is a misnomer, everything gives me a 500 haha

@vahnj is the top the last one? cos thats: commit 7f0320cf07e82abdd5f1e2e8f2f9d381538a2014
Author: Crom <james.vogon@gmail.com>

The top one I see is: commit 3f965c51cb5770c50be84e09a4129d27ffe7a981
Author: Samantha Ghraves <samanthaghraves@gmail.com>
Date: Sun Jan 28 22:07:52 2018 +0000

more stuff

@vahnj Sounds good.

The site is at least up again, so that helps

@vahnj Both are in my remote repos, I mean

@vahnj Yeah, I'm running some stuff from them and cybre.space, so it wouldn't be a huge deal tbh?

@vahnj So, I did the git checkout -b awoo-master awoo/master

Then it switched me to a new branch. Then I did status, and it said I was up-to-date, but that app/javascript/mastodon/features/direct_timeline wasn't tracked, so I added and committed it

The status said I was up to date, so I ran the precompile

@vahnj Yeah, everything was saved in the repo, and that's the part I'm confused about?

Because when I tried to just patch over the whitelisting stuff, it gave me a bunch of errors.

So...I have no idea at this point. Just hoping this compile works so I can deal with everything later

@vahnj That's less of a hassle to fix in the long run, but I have no idea how I managed that

@vahnj So like, I had themes and stuff, but when I cd'd into the directory that hold my themes they were all gone.

Looks like somehow I just overwrote my stuff with yours somehow

@vahnj Oh I have already goofed I think

all my stuff is gone locally haha

At least I haven't pushed changes yet >^<