> The git way of talking about code is rigorous and reliable That's not quite true, for example the mere existence of "git rerere" means that conflicts are no

> The git way of talking about code is rigorous and reliable That's not quite true, for example the mere existence of "git rerere" means that conflicts are not really represented internally. Also, merges like 3-way merge (the default in Git) are not associative [1], meaning that you might get different results if you pull two consecutive commits A and B from a remote, or if you just pull B. [1] https://tahoe-lafs.org/%7Ezooko/badmerge/simple.html https://tahoe-lafs.org/%7Ezooko/badmerge/simple.html