show branches for commit
show remote branches
Merge pull request #4542 from dimagi/show-branches

show branches for conflicting commits in rebuildstaging