show branches for conflicting commits in rebuildstaging

@dannyroberts 
You may also have to strip 'origin/' from it when comparing, though I can't quite wrap my head around all the cases.