3 ms·
> I would say that's less fundamental than answering "give me the exact state of the repo at time t" This is indeed a very important question when you're worki
by pmeunier 8y ago
> I would say that's less fundamental than answering "give me the exact state of the repo at time t"
This is indeed a very important question when you're working alone, but the notion of "at time t" changes when many people work in parallel. This is why Pijul has two notions of time:
- Patches, which always commute when produced in parallel.
- The sequences of patches applied locally to a branch.
Alice and Bob working together can have the same patches and a different application order, what matters for the contents of their file is the set of patches only.
> Of course the hashes won't be the same but does that matter?
It does matter a lot sometimes, for instance if you cherry-pick, solve a conflict, and cherry pick again from the same branch, the fact that Git changes the hashes will make the conflict reappear the second time you cherry-pick.