git-merge 2013
I spent Friday and Saturday on git-merge, an unconference on git. Thursday was developer day, for core contributors to git itself, and libgit2/jgit. I didn't go there. Friday was "user" day, and Saturday was hackday. I figured it might be useful...