git pull <remote> master:dev will fetch the remote/master branch and merge it into your local/dev branch.
git pull <remote> dev will fetch the remote/dev branch, and merge it into your current branch.
I think you said the conflicting commit is on remote/dev, so that is the branch you probably intended to fetch and merge.
In that case, you weren’t actually merging the conflict into your local branch, which is sort of weird since you said you saw the incorrect code in your working copy. You might want to check what is going on in remote/master.
Related Posts:
- How do I delete a Git branch locally and remotely?
- How do I delete a Git branch locally and remotely?
- How do I rename a local Git branch?
- How do I undo the most recent local commits in Git?
- How to merge branch to master?
- How can I switch to another branch in git?
- Download single files from GitHub
- How to revert multiple git commits?
- The following untracked working tree files would be overwritten by merge, but I don’t care
- How to revert multiple git commits?
- The following untracked working tree files would be overwritten by merge, but I don’t care
- merge one local branch into another local branch
- What does “Git push non-fast-forward updates were rejected” mean?
- Git error on commit after merge – fatal: cannot do a partial commit during a merge
- How can I reset or revert a file to a specific revision?
- What is the difference between `git merge` and `git merge –no-ff`?
- The following untracked working tree files would be overwritten by merge, but I don’t care
- git – Your branch is ahead of ‘origin/master’ by 1 commit
- Your configuration specifies to merge with the
from the remote, but no such ref was fetched.? - Set up git to pull and push all branches
- Invalid VCS root mapping – 3 errors on my project
- how to reset develop branch to master
- “fatal: HttpRequestException encountered.” Error with GitHub/Bitbucket Repositories due to dropping TLS-1.0 support
- SourceTree keeps asking for Github password
- Delete branches in Bitbucket
- How to resolve git status “Unmerged paths:”?
- How can I see the changes in a Git commit?
- How do you merge two Git repositories?
- Git merge reports “Already up-to-date” though there is a difference
- How to merge a specific commit in Git
- How can I delete all Git branches which have been merged?
- difference between git merge origin/master and git pull
- Eclipse EGit Checkout conflict with files: – EGit doesn’t want to continue
- How can I push a specific commit to a remote, and not previous commits?
- What’s a good (free) visual merge tool for Git? (on windows)
- Pull latest stable release via git [closed]
- Version control with a team of non-developers
- Painless way to track remote Git repo for WordPress updates
- Questions about Git and WordPress [duplicate]
- How do I check out a remote Git branch?
- How do I use ‘git reset –hard HEAD’ to revert to a previous commit? [duplicate]
- What is git tag, How to create tags & How to checkout git remote tag(s)
- What does ‘–set-upstream’ do?
- What does ‘–set-upstream’ do?
- Difference between “git add -A” and “git add .”
- Git: Message ‘src refspec master does not match any’ when pushing commits in Git
- Git: Message ‘src refspec master does not match any’ when pushing commits in Git
- error: src refspec master does not match any
- What does cherry-picking a commit with Git mean?
- How to cherry pick from 1 branch to another
- How to Git stash pop specific stash in 1.8.3?
- How to use Git Revert
- How do I revert a Git repository to a previous commit?
- What is the best (and safest) way to merge a Git branch into master?
- Git: How do I force “git pull” to overwrite local files?
- Differences between git pull origin master & git pull origin/master
- How do I force git pull to overwrite everything on every pull?
- What happens when I do git pull origin master in the develop branch?
- Undo a Git merge that hasn’t been pushed yet
- How do I properly force a Git push?
- How do I rename a local Git branch?
- fatal: Not a git repository (or any of the parent directories): .git [duplicate]
- How to remove local (untracked) files from the current Git working tree
- Squash my last X commits together using Git
- Git merge hotfix branch into feature branch
- Git refusing to merge unrelated histories on rebase
- Git submodule update
- How to apply a patch generated with git format-patch?
- How do I discard unstaged changes in Git?
- What is the `git restore` command and what is the difference between `git restore` and `git reset`?
- What does ‘git merge –abort is equivalent to git reset –merge when MERGE_HEAD is present.’ of Git merge man page mean?
- What does ‘git blame’ do?
- Abort a Git Merge
- What is the difference between git push origin and git push origin master
- GitHub: Permission denied (publickey). fatal: Could not read from remote repository
- Git fetch remote branch
- 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: How do I force “git pull” to overwrite local files?
- git stash apply version
- How to modify existing, unpushed commit messages?
- How do I clone a specific Git branch? [duplicate]
- Git pushing to remote branch
- How to revert a merge commit that’s already pushed to remote branch?
- What is Git pruning?
- Git pushing to remote branch
- git – remote add origin vs remote set-url origin
- How do I undo ‘git add’ before commit?
- How do I discard unstaged changes in Git?
- Git: Message ‘src refspec master does not match any’ when pushing commits in Git
- GitHub Error Message – Permission denied (publickey)
- Git fetch remote branch
- How can I see the differences between two branches?
- How to upgrade Git on Windows to the latest version
- Reset local repository branch to be just like remote repository HEAD
- How do I push a new local branch to a remote Git repository and track it too?
- Practical uses of git reset –soft?
- Need to reset git branch to origin version
- How do I push a new local branch to a remote Git repository and track it too?