Trust me, when I say 'implicitly', I mean it. The implicit branch here is any local code. It's clearly diverging from the authoritative repo (whatever that is

Trust me, when I say 'implicitly', I mean it. The implicit branch here is any local code. It's clearly diverging from the authoritative repo (whatever that is for your workflow and VCS) My point was that any workflow that doesn't operate in a shared source directory already has those local "branches". You might as well acknowledge it and roll with it. (Doesn't diminish your point about master & origin/master. I think this link is a propos to that: http://wheningit.tumblr.com/post/32959730634/when-the-office-git-expert-has-to-come-fix-everything http://wheningit.tumblr.com/post/32959730634/when-the-office... )