> you don't work on upstream branch unless you don't understand the whole concept of git As painful as it is, it is unavoidable in oddball situations. The prob

> you don't work on upstream branch unless you don't understand the whole concept of git As painful as it is, it is unavoidable in oddball situations. The problem is everyone leaves it as "don't do that" rather than "don't do that, but if you do, here is how to fix it". Normally trudging through the doco would get you to the fix, but back to problem #1.