problem with github

[Derek Fawcus]

My general recommendation for using git is to be explicit, and 
simple.

Which amongst other things means I don't use pull, but instead 
use fetch and merge.  This also means one does not need to set up 
tracking branches, which can be a source of confusion.

I do however operate with an explicit 'triangular' workflow, 
having a private upstream 'fork' (origin) as a remote, as well as 
a remote for the official publish repo (central).  Then I fetch 
from 'central', push to 'origin' and create for PRs from origin 
to central.  Generally avoiding pushes to 'central' even when I 
do have write/commit perms there.

git fetch central # All branches and tags from remote 'central'

git fetch central some-branch # Just the one branch, to local 
central/some-branch

git switch some-branch # to my local instance of the branch I 
want to merge in to
git merge central/some-branch # hopefully it'll be a FF

# While sitting on a branch, say 'some-branch'
git push origin some-branch # Here 'origin' is my personal 'fork' 
vs the 'central' repo

# (I generally reserve the full push form for special cases: git 
push origin local-branch:remote-branch )

# For rebases, also make it explicit, with all three references:

git rebase --onto central/master CUT-POINT some-feature-branch

# In the above CUT-POINT would vary, maybe it'd be 
some-feature-branch^5 if there are 5 commits in that feature, 
possibly it will be a explicit hash, possibly some other branch