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