How can I git pull –rebase but taking all remote changes?

I did git fetch and then git pull --rebase. It is trying to merge changes from the remote branch to my local branch. And there are some merge conflicts. So I did a git reset --hard.

My question is it is possible for me to ask git pull to take the remote change whenever there is a conflict?

  • How to clean the branch list?
  • Git, deleting repository
  • bower init command error (gitbash) in windows
  • Visual Studio Online isn't deploying .js files from TypeScript compilation to Azure
  • How to let git reject any eol style change?
  • Obtaining Git server version
  • Push just part of a git repository to heroku
  • i cloned a git repo and see strange texts in files. HEAD <<< and >>>>>
  • Git: Merging changes after branching before a revert
  • Eclipse/EGit: How to Build a Specific Tag of Git Repo
  • How do I create a commit without a parent in Git?
  • Can't exclude user interface state from commit in xcode
  • One Solution collect form web for “How can I git pull –rebase but taking all remote changes?”

    I think what you want is this:

    git pull --rebase -s recursive -X ours

    But it doesn’t work (I’m using, even though the manpage says it should. I’m guessing this is due to the issue mentioned here.

    Instead, you could use:

    git pull -s recursive -X theirs

    It works as expected, but you’ll get a merge instead of a rebase.

    Also – note ‘ours’, rather than ‘theirs’ when using –rebase. From the git-rebase manpage:

    [CLIP]… a rebase merge works by replaying each commit from the working branch on top of the upstream branch. Because of this, when a merge conflict happens, the side reported as ours is the so-far rebased series, starting with upstream, and theirs is the working branch. In other words, the sides are swapped. …[CLIP]

    Git Baby is a git and github fan, let's start git clone.