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.)
@anthracite Prometheus wouldn't hurt, either. Maybe he'll swipe some code for ya.
Nice guy! Keep an eye on your purse.
@zebratron2084
If he asks "May I borrow your spleen?", it is not an internet joke.
@anthracite