commit 95a7fb4a28ee04c8dffa31c787854f2e1979e0aa parent 92a24e890dc27c46aebff2331cda76695ce8c296 Author: Kévin Le Gouguec <kevin.legouguec@gmail.com> Date: Tue, 16 Nov 2021 23:34:36 +0100 Add article about Git's ort merge strategy Diffstat:
| M | reviews/stack.org | | | 6 | ++++++ |
1 file changed, 6 insertions(+), 0 deletions(-)
diff --git a/reviews/stack.org b/reviews/stack.org @@ -7,3 +7,9 @@ Sold e.g. on [[https://nostarch.com/hardwarehackerpaperback][No Starch Press]]. * [[https://alistapart.com/article/dao/][A Dao of Web Design]] [[https://alistapart.com/blog/post/15-years-of-dao/][And followup]]. * [[https://publicdomainmanifesto.org/manifesto/][Public Domain Manifesto]] +* Optimizing Git Merge's Machinery +- [[https://blog.palantir.com/optimizing-gits-merge-machinery-1-127ceb0ef2a1][part 1]] +- [[https://blog.palantir.com/optimizing-gits-merge-machinery-2-d81391b97878][part 2]] +- [[https://blog.palantir.com/optimizing-gits-merge-machinery-3-2dc7c7436978][part 3]] +- [[https://blog.palantir.com/optimizing-gits-merge-machinery-part-iv-5bbc4703d050][part 4]] +- [[https://blog.palantir.com/optimizing-gits-merge-machinery-part-v-46ff3710633e][part 5]]