Crom, Kobold King @vahnj@awoo.space

@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

@Fidgetcetera hope you start feeling better soon :<

@er1n it's been around a while! kobold.space

I use it for testing awoo.space changes, primarily

anyone ever have problems with reading Scaleway repos?

Here's an apt update error I'm getting:

E: The repository 'http://mirror.scaleway.com/ubuntu zesty Release' does no longer have a Release file.

jacking in https://awoo.space/media/glfvIMbBjdcUhoWfkj8