OK. The problem is your previous pull failed to merge automatically and went to conflict state. And the conflict wasn’t resolved properly before the next pull.
- Undo the merge and pull again.To undo a merge:
git merge --abort
[Since git version 1.7.4]git reset --merge
[prior git versions] - Resolve the conflict.
- Don’t forget to add and commit the merge.
git pull
now should work fine.
Related Posts:
- What is git tag, How to create tags & How to checkout git remote tag(s)
- What is the best (and safest) way to merge a Git branch into master?
- Squash my last X commits together using Git
- How to apply a patch generated with git format-patch?
- Abort a Git Merge
- GitHub: Permission denied (publickey). fatal: Could not read from remote repository
- How to delete a remote tag?
- Updates were rejected because the tip of your current branch is behind its remote counterpart
- Updates were rejected because the tip of your current branch is behind its remote counterpart
- git stash apply version
- Git fetch remote branch
- Updating a local repository with changes from a GitHub repository
- How do I remove a submodule?
- Git push results in “Authentication Failed”
- What does “Changes not staged for commit” mean
- git: fatal: Could not read from remote repository
- Git push results in “Authentication Failed”
- Download single files from GitHub
- How do I update Homebrew?
- Git error when trying to push — pre-receive hook declined
- Ignoring directories in Git repositories on Windows
- Gitignore not working
- Could not open a connection to your authentication agent
- How to get just one file from another branch?
- git checkout a single file from another branch and put in different folder
- Update Git branches from master
- Stash only one file out of multiple files that have changed with Git?
- Create a branch in Git from another branch
- What is HEAD in Git?
- What are the differences between git remote prune, git prune, git fetch –prune, etc
- Why do I have to “git push –set-upstream origin
“? - How do you create a remote Git branch?
- Move the most recent commit(s) to a new branch with Git
- How do I resolve git saying “Commit your changes or stash them before you can merge”?
- rejected master -> master (non-fast-forward)
- How do you stash an untracked file?
- How to name and retrieve a stash by name in git?
- Create a tag in a GitHub repository
- Filename too long in Git for Windows
- What is the difference between git rm –cached and git reset
? - How can I delete a file from a Git repository?
- Git: Could not resolve host github.com error while cloning remote repository in git
- What does git rev-parse do?
- Make an existing Git branch track a remote branch?
- git – pulling from specific branch
- GitHub: invalid username or password
- Why do I have to “git push –set-upstream origin
“? - How do you create a remote Git branch?
- Stash just a single file
- How can I reset or revert a file to a specific revision?
- How do I provide a username and password when running “git clone [email protected]”?
- “*** Please tell me who you are.” when using SSH key
- master branch and ‘origin/master’ have diverged, how to ‘undiverge’ branches’?
- Pull request vs Merge request
- What is the difference between `git merge` and `git merge –no-ff`?
- git pull from master into the development branch
- Clone A Private Repository (Github)
- Is there a “theirs” version of “git merge -s ours”?
- Your configuration specifies to merge with the
from the remote, but no such ref was fetched.? - How to clone a specific Git tag
- ! [rejected] master -> master (fetch first)
- How to git add a whole folder
- Heroku: How to change a Git remote on Heroku
- Updates were rejected because the remote contains work that you do not have locally
- fatal: This operation must be run in a work tree
- Undoing a ‘git push’
- How to replace local branch with remote branch entirely in Git?
- Git diff against a stash
- What’s the significance of the “No newline at end of file” log?
- How to revert a “git rm -r .”?
- Git update submodules recursively
- Do a “git export” (like “svn export”)?
- What does git push origin HEAD mean?
- How do I set up Eclipse/EGit with GitHub?
- Repository size limits for GitHub.com
- How to clone git repository with specific revision/changeset?
- How to compare a local Git branch with its remote branch
- git push origin master does not work
- Git clone verbose output?
- Could not create work tree dir ‘example.com’.: Permission denied
- Is there a git-merge –dry-run option?
- How to answer the git prompt in npm init for a local repo
- Add all files to a commit except a single file?
- How to update Git clone
- Git says “Automatic merge failed”, what does it mean?
- Sourcetree adding files in global .gitignore, not in repository .gitignore
- git pull remote branch cannot find remote ref
- How to configure git bash command line completion?
- How do I change the default location for Git Bash on Windows?
- How to stop tracking and ignore changes to a file in Git?
- Git Push Error: insufficient permission for adding an object to repository database
- Git push requires username and password
- WordPress and Git – What folders should I track?
- Multiple copies of the same website: how to organize code/architecture?
- Pull latest stable release via git [closed]
- Why do the Roots theme CSS files not load (404)?
- Version control with a team of non-developers
- Painless way to track remote Git repo for WordPress updates
- Questions about Git and WordPress [duplicate]
- WordPress on git – need help with configuration