Blogs / Personal blogs

Russell O'Connor

r6.ca

I have my Ph.D. in Science from Radboud University Nijmegen . I have my bachelor’s of mathematics in Pure Mathematics and Computer Science from the University of Waterloo .

Popular posts
6
Total points
1,177
HN comments
611
Rank
#1,751 personal

Visit r6.ca → On Hacker News Apr 2011 – Sep 2020

Software Engineering 3Systems & Performance 2Programming Languages 2Tools & Productivity 1Math & Algorithms 1Crypto & Blockchain 1

1

Git is Inconsistent

Zooko provides a nice example of the problems with most distributed version control systems merge algorithms. He gives an example of a merge situation that most version control systems, including git, get wrong, but that darcs, Codeville, SCCS, and perhaps BitKeeper get correct.