I'd like to merge my branch into master. I've committed everything on my branch switched to master. I need to do git pull to make sure I'm up to date, however when I try to git merge mybranch I get the error
error: merge is not possible because you have unmerged files.
git status shows lots and lots of files that are modified, presumably from my most recent pull. Should I do a git add . `git commit -m "something??", or what's the best way to handle this? It seems weird to do a commit for a bunch of changes that already have their own commits by their respective authors?