On at least one repository You have unmerged paths. (fix conflicts using plain git) Unmerged paths: both deleted: new added by them: new1 added by us: new2 both deleted: repo/new added by them: repo/new1 added by us: repo/new2 Changes to be committed: Changes not staged for commit: Untracked files: