show branches for conflicting commits in rebuildstaging

@dannyroberts 
I think this was the failure mode we discussed, which is that this only shows local branches. I think you can just replace with `git.branch('--remote', '--contains', commit)`.