While performing a git merge you may find that git reports a "merge conflict" error. It will report to you which files have conflicts, and you will need to resolve the conflicts.
A git status at any point will help you see what still needs editing with a helpful message like
On branch ma...
