Apply directly to the forehead
Apply directly to the forehead
I mean, you just need to look at the conflicting files, fix up the code, then stage those changes and pop a new commit
There’s no “special” merge conflict resolution commit “type”
As for fixing the code itself, I usually look at what changed between both versions, and then re-author the code such that both changes make “sense”
We kinda do, with GPS satellites that have to correct their clocks due to the effects of gravity and speed
And communication with space probes
I use 24h clocks and ISO 8601 dates almost always
Honestly, I’m better at organizing code than I am my actual life
Timezones make intuitive sense for humans
UTC / Unix timestamps make intuitive sense for computers
The issue is bridging the gap
It’s an explicit “opt-out” by the OP, such that their content cannot (legally) be used to train LLMs or such (Chat GPT, Github Copilot, etc)
Well, that’s what I assumed until i read the license terms. It doesn’t explicitly mention AI or LLMs, but it does say
You may not use the material for commercial purposes
Which i assume has the same limitations for AI training, for commercial AI
(I am not a lawyer)
While i also disagree with python’s tendency to use exceptions as control flow
Python is a pretty stellar scripting language. I wouldn’t use it for app dev, but it’s quite handy for the odd automation or CLI task
I recently broke the networking stack by uninstalling ca-certificates
I was using a slightly risky command to delete unneeded packages, and for some reason ca-certificates
was on the list
At least the fix was simple. Boot the rescue iso and reinstall them
Imo, it’s nice to see tools written in a memory safe systems language
Especially if you use a lot of them. More utility, less attack surface