Duplicated merge conflicts

[NuclearCookie]

I have a project structure where I have 3 layers of repositories ( with submodules )

Game | Scripting Engine | C++ Engine

If I get a merge conflict in my Game repository, This packages shows all merge conflicts 3 times. Also every popup to stage is shown 3 times. I'll attach some images the next time I have this issue.

[smashwilson]

Ah, submodules are an area that I haven't even tried to address yet. That's kind of a weird failure case, though - I'm a little surprised it finds conflicts inside the submodules at all!