waterofclear

4 ms·

1. 1.▲
   by waterofclear 6y ago

   Which part of my reply do you object to? Maybe you object to my first sentence but I am trying to make sure my understanding is correct with the scanario I laid out at the end. Would that require 1 or 2 conflict resolutions? I actually trie
2. 2.▲
   by waterofclear 6y ago

   > That's actually the case, because you can totally simulate Git using Pijul if you want, except for the weird merges where Git shuffles up lines randomly. I don't think this is true. The snapshot model is fundamentally differe
3. 3.▲
   by waterofclear 6y ago

   I'm not sure what you mean. Git is snapshot based. There is nothing to fix when committing, you just commit the result of the merge. Any diff you see is just for display purposes or for input to the three-way merge algorithm. Other use
4. 4.▲
   by waterofclear 6y ago

   Note that you could implement a Token or AST aware merging strategy for git as how you merge is an implementation detail that is not encoded into the repo.
5. 5.▲
   by waterofclear 6y ago

   I looked into Pijul in the past but in the end the model seemed worse than git to me. Git is a snapshot based model and so doesn't leak any implementation details about patches themselves. Every user can use whatever diffing algorithm
6. 6.▲
   by waterofclear 6y ago

   This wing was donated by "anonymous". All eyes look at Ted Danson