show branches for conflicting commits in rebuildstaging

@dannyroberts 
hehe, `'    '` is shorter than `' ' * 4' by one char