I am trying to perform a pull and it keeps erroring out that I have not concluded the merge. Where do I find merge? There are no pending files and no conflicts.
Try git commit first.
If it doens't work, you need to run:
git merge --abort
git reset --merge
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.