Conflicting files get added

[Rand-Random]

When the option automatically add files is active and you update the solution from within visual studio.

You end up with *.mine, *.rxxx files getting added.

Notice the Change state is now "Missing" because I resolved the conflicts and resolving deletes the file but the artifact that they got added prior is still there, what I now need to do is select them right click and say revert.

[rhuijben]

I guess you see this issue in modern projects that automatically include all files in the project?

[Rand-Random]

Yes.