added option -r: support more robust consolidation of local clones with varying names;