Duplicated merge conflicts

smashwilson / merge-conflicts

Resolve git merge conflicts in Atom

https://atom.io/packages/merge-conflicts

MIT License

431 stars 42 forks source link

Duplicated merge conflicts #175

Open NuclearCookie opened 9 years ago

NuclearCookie commented 9 years ago

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 commented 9 years ago

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!