4 ms·
Very cool project — love the offline-first, Git-native approach. One question: How do you handle conflict resolution when multiple users modify the same issue
by badmonster 1y ago
Very cool project — love the offline-first, Git-native approach. One question:
How do you handle conflict resolution when multiple users modify the same issue or thread concurrently across remotes? Is it purely Git's merge mechanics, or do you apply any domain-specific heuristics?
- sudoforge 1y agomaintainer here. great question! git-bug embeds a "lamport timestamp" [0] - that is, a logical clock, not a wall clock - in each operation (like the creation of a bug, or a comment, or an edit to a comment). this, combined with the data model [1] we use, allow activity to be recorded and replayed without ever encountering a merge conflict. [0]: https://en.wikipedia.org/wiki/Lamport_timestamp https://en.wikipedia.org/wiki/Lamport_timestamp [1]: https://github.com/git-bug/git-bug/blob/master/doc/design/data-model.md https://github.com/git-bug/git-bug/blob/master/doc/design/da...