show branches for conflicting commits in rebuildstaging

@dannyroberts