Pull a certain branch from the remote server

by

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 basically doing this:

$ git fetch origin other-branch && git merge other-branch

That is, a pull is just a fetch followed by a merge. However, when pull-ing, Git will only merge other-branch if it can perform a fast-forward merge. A fast-forward merge is a merge in which the head of the branch you are trying to merge into is a direct descendent of the head of the branch you want to merge. For example, if you have this history tree, then merging other-branch would result in a fast-forward merge:

O-O-O-O-O-O
^         ^
master    other-branch

However, this would not be a fast-forward merge:

    v master
O-O-O
\
 \-O-O-O-O
         ^ other-branch

To solve your problem, first fetch the remote branch:

$ git fetch origin other-branch

Then merge it into your current branch (I’ll assume that’s master), and fix any merge conflicts:

$ git merge origin/other-branch
# Fix merge conflicts, if they occur
# Add merge conflict fixes
$ git commit    # And commit the merge!

More Related Contents:

  1. Git – how to force merge conflict and manual merge on selected file
  2. Can I make fast forwarding be off by default in git?
  3. git merge: Removing files I want to keep!
  4. Git: Merge to master while automatically choosing to overwrite master files with branch
  5. Delete local Git branches after deleting them on the remote repo
  6. What to do with branch after merge
  7. Branch from a previous commit using Git
  8. How to replace master branch in Git, entirely, from another branch? [duplicate]
  9. How do you merge two Git repositories?
  10. How do I clone a single branch in Git?
  11. Default behavior of “git push” without a branch specified
  12. Is it possible for git-merge to ignore line-ending differences?
  13. Vendor Branches in Git
  14. Does “git fetch –tags” include “git fetch”?
  15. How can I search Git branches for a file or directory?
  16. Git – Ignore files during merge
  17. How do I delete all Git branches which have been merged?
  18. How do I merge my local uncommitted changes into another Git branch?
  19. How to pull specific directory with git
  20. Does deleting a branch in git remove it from the history?
  21. git rebase and git push: non-fast forward, why use?
  22. Disable Git Rename Detection
  23. git partial merge, not whole branch
  24. Simple tool to ‘accept theirs’ or ‘accept mine’ on a whole file using git
  25. How can I get the parents of a merge commit in Git?
  26. Reverting a git merge while allowing for the same merge later)
  27. Git: How to create patches for a merge?
  28. Git merge squash repeatedly
  29. The following untracked working tree files would be overwritten by merge, but I don’t care
  30. Commit a file to a Different Branch Without Checkout

Leave a Comment