Pull is not possible because you have unmerged files, git stash doesn’t work. Don’t want to commit

git fetch origin
git reset --hard origin/master
git pull

Explanation:

  • Fetch will download everything from another repository, in this case, the one marked as “origin”.
  • Reset will discard changes and revert to the mentioned branch, “master” in repository “origin”.
  • Pull will just get everything from a remote repository and integrate.

See documentation at http://git-scm.com/docs.

Leave a Comment

Hata!: SQLSTATE[HY000] [1045] Access denied for user 'divattrend_liink'@'localhost' (using password: YES)