On at least one repository
You have unmerged paths.
  (fix conflicts using plain git)

Unmerged paths:
        both modified:	file
Changes to be committed:

Changes not staged for commit:

Untracked files: