Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conflicting files get added #22

Open
Rand-Random opened this issue Nov 9, 2021 · 2 comments
Open

Conflicting files get added #22

Rand-Random opened this issue Nov 9, 2021 · 2 comments

Comments

@Rand-Random
Copy link

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

image

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

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
Copy link
Member

rhuijben commented Dec 9, 2021

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

@Rand-Random
Copy link
Author

Yes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants