git pull issue. Please advice

[joebordes]

try first `git commit` to see if you can proceed with the pull and finish it

if that doesn't work, try a `git merge --abort` to see if you can undo the pull and then do it correctly

Let me know how it goes