My origin has a fixes and a fixes_v3 branch. My client has just fixes. I do a git pull git+ssh:/.../mygitrepo and suddenly on my client I have all the fixes_v3 code in the fixes branch. Why on earth did this happen? Now I try git pull ... mygitrepo fixes and it just tells me it’s up to date.
git remote show origin gives this:
HEAD branch: fixes
Local refs configured for 'git push':
fixes pushes to fixes (fast-forwardable)
master pushes to master (up to date)
Apparently your branches are tracking the false remotes. Do a
git remote show originto see which branch remote branchfixesmerges. It probably will say something likeAdjust this accordingly after undoing your last merge.