Time to start working on merging all my little feature branches into the latest stable branch.

There's *got* to be a better way than this, I should do some research. trying to rebase from my main 'dragonstyle' branch becomes a hell of repeatedly saying "no I wanna keep this line I changed" to every single change the main repo made in files I've touched.

I think ideally I want to be able to say "okay figure out ALL the diffs between the 'dragonstyle' branch and 'stable-2.4.3', then interactively apply them to 'stable-2.7'. Maybe I should, like, actually read the manuals for Git and/or the GUI tool I use. (Which is Fork, if you are curious.)

tl;dr for dragon.style users: image uploads are still broken because the disc is full of other instance's media and the cleanup task does nothing, I'm about to go neck-deep into the code, pray to whatever deities you think are appropriate. I'm thinkin' Hermes is the most appropriate in the Hellenic pantheon for anything to do with communications?

Also I am doing this while listening to some Tuareg rock and roll and that is pretty cool. kel-assouf.bandcamp.com/album/

Aha it looks like

> checkout 2.7
> make a dragon-2.7 branch off of that
> git merge dragonstyle

may be doing what I want. Core git functionality, in the first couple chapters of the manual. Who'da thunk.

Damn that went a lot faster than the last time I did this. I got to use the cool diff GUI tools and everything, too. Time to stretch and finish processing the pot of tea I had while doing this, maybe relocate to another cafe, and see if my local development instance works with this new code.

If it does then we will be going down for an update sometime this evening.

@zebratron2084

Coming home. Rentals are overdue and I’m gonna deal with them.

Sign in to participate in the conversation
Awoo Space

Awoo.space is a Mastodon instance where members can rely on a team of moderators to help resolve conflict, and limits federation with other instances using a specific access list to minimize abuse.

While mature content is allowed here, we strongly believe in being able to choose to engage with content on your own terms, so please make sure to put mature and potentially sensitive content behind the CW feature with enough description that people know what it's about.

Before signing up, please read our community guidelines. While it's a very broad swath of topics it covers, please do your best! We believe that as long as you're putting forth genuine effort to limit harm you might cause – even if you haven't read the document – you'll be okay!