News for hackers. Stuff that matters.
Re:Lowercase – A simple way to take and share notes by pkulak on Friday May 03, 2024 @02:59PM (#40251036)
Yeah, every year or so I get a merge conflict, and then the whole things stops syncing and it takes me a week to notice before I go in and resolve it. It's not perfect, but I can't be assed to fix something that happens once a year. :/
Re:Lowercase – A simple way to take and share notes by darknavi on Friday May 03, 2024 @03:11PM (#40251175)
Maybe you can beep the motherboard if it happens. Would only take a few hours to notice then :)
Re:Lowercase – A simple way to take and share notes by tomsmeding on Saturday May 04, 2024 @08:21AM (#40257107)
> it takes me a week to notice before I go in and resolve it

Perhaps the `|| true` on the `git stash pop` could have a bit more handling :)