What this means Your upstream—the remote you call origin—no longer has, or maybe never had (it’s impossible to tell from this information alone) a branch named feature/Sprint4/ABC-123-Branch. There’s one particularly common reason for that: someone (probably not you, or you’d remember) deleted the branch in that other Git repository. What to do This depends on … Read more
The steps you listed will work, but there’s a longer way that gives you more options: git checkout dmgr2 # gets you “on branch dmgr2” git fetch origin # gets you up to date with origin git merge origin/master The fetch command can be done at any point before the merge, i.e., you can swap … Read more
But I get an error “! [rejected]” and something about “non fast forward” That’s because Git can’t merge the changes from the branches into your current master. Let’s say you’ve checked out branch master, and you want to merge in the remote branch other-branch. When you do this: $ git pull origin other-branch Git is … Read more