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
It looks like you're new here. Sign in or register to get started.
