Git pull pulling in not possible because you have unmerged files

LiBinbinOriginalLess than 1 minute


1.git pull will cause a merge operation to cause conflicts, and you need to resolve the conflicting files before successful pull

So execute the following command:

git add -u
git commit -m "Notes"
git pull

2.Discarding local changes also resolves conflicts

Abandon local changes git reset --hard FETCH_HEAD, where FETCH_HEAD represents the commit point after the last successful pull, and then git pull

Last update:
Contributors: rumosky
  • Latest
  • Oldest
  • Hottest