show branches for conflicting commits in rebuildstaging

@dannyroberts 
bleh, github rendering fail. there are four spaces in the first one. no need to change (obviously)