web commit by joey: thoughts on conflict resolution, gobbing, locking