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

Question

I just want to pull. I have changes to disregard, my Gemfile and Gemlock files and I\'d be happy to just overwrite them and just pull. I tried stashing my changes away, this

Answer 1

I've had the same error and I solve it with: git merge -s recursive -X theirs origin/master