So apparently the doodle_modal crashed webpacker, and I'm not even sure what part of that wouldn't be working? I didn't grab that one originally, so yeh.
@vahnj I would be contacting you through occult.camp, but that took the thing down haha
@spiderrobotpig whoops
did you do a full bundle install and yarn install around the new changes?
@spiderrobotpig OH did you change back to master?
@vahnj I ran the code you told me to, and it created a branch so far as I can tell?
It looked good, but I've never really worked with branches
@spiderrobotpig sorry my bad! yeah there's one more step after that, which is to change back to master:
git checkout master
*then* you can cherry-pick the changes you want!
@vahnj Oh no haha
Okay, I'll do that then >^<
@spiderrobotpig sorry about that >_<;
@vahnj Oh I have already goofed I think
all my stuff is gone locally haha
At least I haven't pushed changes yet >^<
@spiderrobotpig !!!!!
what do you mean it's gone, locally?
@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
@spiderrobotpig Did you have them saved in your git repository? It should not have overwrote them without complaining that there's conflicts if you didn't
@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
@spiderrobotpig ok hang on
what commands have you run since checking out the master branch
@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
@spiderrobotpig It's gonna be safer to pull stuff on top of your existing code imo.
Let's start back over and I'll give you a bunch of commands. Let me plan it out
@spiderrobotpig Also, if you checked in your changes to the awoo.space branch, you are going to need to cherry-pick that commit. What's the top entry when you run "git log"?
@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
@spiderrobotpig oh dear
you mentioned you committed some changes that had been left over, right? is that what commit 3f965c51cb5770c50be84e09a4129d27ffe7a981 is?
@vahnj Yes.
How bad did I fuck up, tell it to me straight doc
@vahnj I can restore the site from backup, but I don't know what that's gonna do to the repo at this point
@spiderrobotpig no, this is great.
run these commands:
git checkout master
git cherry-pick 3f965c51cb5770c50be84e09a4129d27ffe7a981
This will get you back to where you were before you started trying to pull awoo stuff
@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 That's what I get
@vahnj Oh wait I think I see what happened, gimmie a sec
@spiderrobotpig Sounds like you added a file, but iddn't do the commit
@vahnj Yeah, I had to modify win95.scss to make the webpacker do anything.
So, fixing the issue I get
@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'
@spiderrobotpig great so that means you already have that stuff in master!
run this:
git cherry-pick --abort
@vahnj Okay, I will do this instead
@vahnj Okay, I did that
@spiderrobotpig OK! Let me build the commands to cherrypick the whitelist changes for you
@vahnj Thank you so much, sorry I'm the worst at computers haha
@spiderrobotpig nah you're fine!!
@spiderrobotpig it's unreasonable to expect anyone to know git imo
@vahnj Git is so much haha
Okay, so after running the cherrypicks, do I just go ahead and run the precompile command?
1. git cherry-pick 4e2f183775f7b72fa59aad9d6c401d71d5ff6f2f
2. git cherry-pick 78915f2dc02ea38c12ddeaa326f9bd24ac467fc3
3. git cherry-pick 3923a31c1ac9302bb55e1509ededf503df8c4e4e
Let me know if you get stuck at any steps
@spiderrobotpig You should be able to run this then:
git reset
git checkout master
git cherry-pick 3f965c51cb5770c50be84e09a4129d27ffe7a981
@vahnj Now it's saying the cherry-pick is empty.
Let me go further back
@spiderrobotpig no no you're good
@vahnj Also, the site being up is a misnomer, everything gives me a 500 haha
@vahnj Sounds good.
The site is at least up again, so that helps
@vahnj Both are in my remote repos, I mean