Pull a certain branch from the remote server

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