Error when using git pull
I've used git pull today to compile a new Showtime. I get this error:
girish@girish-linux:~/Documents/showtime$ git pull
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.
Any help would be very much appreciated, thank you.
RE: Error when using git pull - Added by Andreas Öman over 1 year ago
You cannot pull if you have modified files in your own copy.
git status to see what those fiels are. and use
git checkout <path> to reset them.