> That happened in Melbourne and it wasn't pleasant. Instead > of enjoying talks at the conference some of us were stressing > out on our laptops dealing with our merges instead.
That argues for doing the merges before LCA so only the fallout is after (when people are easily located).