Incremental merge for Git (technical talk)

[mhagger]

I offer to do a whiteboard-style informal technical talk about incremental merging in Git. This is a style of merging in which commits from two branches are merged pairwise, allowing conflicts to be resolved at a very fine granularity. I think it's a cool idea and has some interesting theoretical aspects. See introduction and links therein.

I've just released an experimental version of git-imerge, a tool for automating incremental merges.