So I'm trying to get better at #git. I added a Development branch to one of my repositories for me to muck around with, leaving the Main branch for people to download.
But I just finished working on a new script which is ready for beta, added it to main and pushed it up to the repository, then remembered to fill out some metadata in the header, changed it and pushed the changes while still on Main.
So now Main has some tweaks that aren't in Development. How do I synch up my development branch with main now, without losign all the bits and bobs that are in Development but not in Main?

BTW if you want to download a hot off the press GPU-accelerated tiling plugin for #BlackMagicFusion it's at https://codeberg.org/stib/stibs_fuses

#coding #ISuckAtGit #AskFedi

Heya, I have a e-bike question?
Can I change a Bafang display for another Bafang display of the same model without having to reprogram the display/anything?

Partners ebikes display has a crack in it and i have a factory shipped display they guaranteed to work but im scared I'd lock out the bike 🫠

#ebike #bafang #askfedi

Seriously considering leaving the #US ASAP. I'm currently researching countries to immigrate to but I'd appreciate the input of the #Fediverse.

#AskFedi #USPol

#chemistry people:

We're working on pH and acid base equilibria in one of my classes. If I had them do a lab where they prepare two solutions - acetic + ammonium hydroxide - at known concentrations, measure pH, and then calculate Ka/Kb, are there other extensions that would make it more rigorous?

We have not done buffers or weak titrations yet - I'm slowly working my way there.

#askfedi #teaching

does anyone know what this bot is for? is it something manually initiated or something completely automatic? note that i dont use #cloudflare in fact, my code has blocked these requests. therefore its a bit of role reversal if you think about it. >:)

but i am still curious about if its manual or not. because the page it linked to didn't say.

#sysadmin #askfedi

Hey, I would like to know if there is a way to import House Flipper 2 .house files into Unity, to create VRChat worlds.

I can't find anything on the web so I have to #askfedi
#houseflipper #unity #vrchat

Thinking of getting a refurbished Dell or Lenovo laptop to run linux on. Mostly to organise and process photos, but also some light CAD. I'll probably look for a laptop with 32gb ram.

The question is how much I should consider processor generation? Should I avoid laptops that are older than 11th gen intel processors?
Gen 9 and 10 are considerably cheaper, but I would like the computer to last a couple of years.

#techsupport #buyingadvice #linuxlaptop #linux #freecad #laptop #askfedi #hardware