5 ms·
The Git model is to version everything together. This means that a conflict blocks the entire repo until it's fixed. In many situations, it's better to version
by remram 4y ago
The Git model is to version everything together. This means that a conflict blocks the entire repo until it's fixed.
In many situations, it's better to version separate pages/items/notes separately, and have a conflict to a single note leave the rest of your repo working and syncing.
- YetAnotherNick 4y agoSeparate git repo for each note will fix this, right? Another possibility you can use some trick like https://stackoverflow.com/a/64810110/936584 https://stackoverflow.com/a/64810110/936584 to prefer one version.
- vhanda 4y agoThis 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.