Separate git repo for each note will fix this, right? Another possibility you ca... | Hacker News

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

		YetAnotherNick on June 29, 2022 \| parent \| context \| favorite \| on: GitJournal: Mobile first Markdown notes synchroniz... Separate git repo for each note will fix this, right? Another possibility you can use some trick like https://stackoverflow.com/a/64810110/936584 to prefer one version.

vhanda on June 29, 2022 [–]

This is similar to what GitJournal does. It'll never present you with a merge conflict and will instead just make prefer the local changes.

It's not perfect, but in the worst case, the wrong option is chosen, but no data is lost since the history is there in Git.

Consider applying for YC's Summer 2026 batch! Applications are open till May 4
Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact