u/DoktorLuciferWong

i think this is a simple situation, but i'm not sure how to handle it. i have some code that has/had no change tracking with git (or anything)

this code rarely gets changed, and has at most one (or two) changes on it.

the repo this code is from has about 50 commits, so git gives me a warning about my branch having diverged from origin/master

in theory, my local changes should come after those 50 commits

i'm the only one maintaining this code now

do i rebase or merge in this situation?

Where can I purchase a laptop dongle for the Keychron M4?

I'm talking about those really small ones you can plug directly into a USB port without a cable. I don't mind that a laptop dongle is probably limited to 1khz polling