Git status during merge conflict

Running git status during a merge-conflict can often show a scarily-large number of files. These represent the work of other people in the group. If it has been several days since your last pull, there could be dozens and dozens of files that were changed by other people.

This is in fact perfectly normal for merge-commits. There is no need to worry. For each conflicted file, listed under git status: Resolve the conflicts with the editor, looking for git conflict markers.

vi <somefile>

After resolving the conflict, do git add for each file.

git add <somefile>

When all have been resolved, do

git commit -m 'fixed merge conflict.'