Crom, Kobold King @vahnj@awoo.space

@spiderrobotpig nah you're fine!!

@spiderrobotpig

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 OK! Let me build the commands to cherrypick the whitelist changes for you

@spiderrobotpig no no you're good

@spiderrobotpig great so that means you already have that stuff in master!

run this:

git cherry-pick --abort

@spiderrobotpig You should be able to run this then:

git reset
git checkout master
git cherry-pick 3f965c51cb5770c50be84e09a4129d27ffe7a981

@spiderrobotpig Sounds like you added a file, but iddn't do the commit

@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

@spiderrobotpig oh dear

you mentioned you committed some changes that had been left over, right? is that what commit 3f965c51cb5770c50be84e09a4129d27ffe7a981 is?

@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"?

@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 OK, so you didn't run the checkout back to your original master branch it sounds like.

You're going to want to do that, unless you want to run glitch.social. (Are you already running it?)

@spiderrobotpig ok hang on

what commands have you run since checking out the master branch

@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

@spiderrobotpig !!!!!

what do you mean it's gone, locally?

@spiderrobotpig sorry about that >_<;

@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!

@spiderrobotpig OH did you change back to master?

@spiderrobotpig whoops

did you do a full bundle install and yarn install around the new changes?

@tom wew