Yeah, every year or so I get a merge conflict, and then the whole things stops s... | Hacker News

Hacker Newsnew | past | comments | ask | show | jobs | submit

pkulak on May 3, 2024 | parent | context | favorite | on: Lowercase – A simple way to take and share notes

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. :/

tomsmeding on May 4, 2024 | [–]

> 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 :)

darknavi on May 3, 2024 | [–]

Maybe you can beep the motherboard if it happens. Would only take a few hours to notice then :)

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact