Can we post the merge -s ort presentation from Git Merge 2020?

[nasamuffin]

git-merge.com redirects to github.com now, which means the slides are lost from there. Do you have the slides from your presentation on ORT? We'd love to refer to it.

[newren]

Do you mean my Git Merge 2020 presentation on my partially implemented ideas for improving the performance of the merge machinery? ("ORT" wasn't made public as a name until months later) If so, it's here: https://github.com/newren/presentations/blob/pdfs/merge-performance/merge-performance-slides.pdf

Or do you mean my blog posts about the optimizations I actually ended up putting into ORT? If that's what you want, you can get a link to the sixth post here (which has links to the previous five blogposts near the top of it): https://blog.palantir.com/optimizing-gits-merge-machinery-6-7bf887a131d8

Also, a slight tangent: I got permission to allow any of my contributions to git to be picked up by related projects like libgit2 and jgit. So if you want to take any of the ORT code that I wrote for jgit, feel free. (Do note, though, that some small pieces of ORT were copied from merge-recursive.c, and I wasn't the author for some of those, so you have to verify it wasn't one of those copied bits first. But I suspect those are the less interesting bits for someone to take.). I know the language difference might mean you don't want any of the code, but if it's still useful somehow and you want it under jgit's license, you're free to take and use it that way.

[nasamuffin]

Do you mean my Git Merge 2020 presentation on my partially implemented ideas for improving the performance of the merge machinery? ("ORT" wasn't made public as a name until months later) If so, it's here: https://github.com/newren/presentations/blob/pdfs/merge-performance/merge-performance-slides.pdf

Ah, for some reason I thought it was much more mature at Git Merge 2020, interesting!

Or do you mean my blog posts about the optimizations I actually ended up putting into ORT? If that's what you want, you can get a link to the sixth post here (which has links to the previous five blogposts near the top of it): https://blog.palantir.com/optimizing-gits-merge-machinery-6-7bf887a131d8

Thanks, I googled "Elijah Newren blog" and came up with a lot of stuff from 2008, but not this :)

Also, a slight tangent: I got permission to allow any of my contributions to git to be picked up by related projects like libgit2 and jgit. So if you want to take any of the ORT code that I wrote for jgit, feel free. (Do note, though, that some small pieces of ORT were copied from merge-recursive.c, and I wasn't the author for some of those, so you have to verify it wasn't one of those copied bits first. But I suspect those are the less interesting bits for someone to take.). I know the language difference might mean you don't want any of the code, but if it's still useful somehow and you want it under jgit's license, you're free to take and use it that way.

Thanks a bunch!