3 ms·
> It is append-only: once a file in the .unison directory is created, it is never modified or deleted, and files are always named uniquely and deterministically
by steve_taylor 7y ago
> It is append-only: once a file in the .unison directory is created, it is never modified or deleted, and files are always named uniquely and deterministically based on their content.
That's how conflicts are avoided.
- aidenn0 7y agoSo I append X to my file and you append Y to your file, do we not have a conflict?
- capableweb 7y agoYes and no. Yes as in, if you'd like them to be merged into a new one, then you'll have to resolve a conflict. But no as in, you both appended different data, so you both have new files from the original one, as you're dealing with immutable data.
- strbean 7y agoIf you want to resolve merges using the workflow of git, you can generate scratch files and diff them, right?