Seriously!
Why not show the names of the branch + short Id (and when is not direct name, at least "this is from NAME")
doesn't it? Next to the conflict markers, it'll display HEAD, the ref name, or the short commit hash.
alt Hacker News
doesn't it? Next to the conflict markers, it'll display HEAD, the ref name, or the short commit hash.