til
TIL: “ours" and "theirs" git merge strategies
When I’m either: * working on an experimental branch that I have no intention of merging into main, yet want to incorporate updates into; or * if I know with 100% certainty that I want to resolve merge conflicts in a particular direction (my branch vs. the one being merged in)
TIL: OSC 52
I’m working on setting up a mini PC to serve as my homelab server instead of my MacBook (more details to come in a future post) and I’ve configured it so I can ssh into it from anywhere. However, there’s been a few times where I’ve
