Issues with source control and deleting files

[madharrison]

Hello,

I have a Flare project that's connected to TFS. From Flare, I was deleting some of the project's old files. These files were listed in my Pending Changes in Visual Studio; however, they weren't listed as check-in changes in Flare.

Afterwards, one of the developers merged this project into another branch. In this branch, the 'deleted' files were still in this merged project.

Do you have any advice to avoid complications like this? I know this may be tricky since we're dealing with an application outside of Flare. Is there a best way to delete files from projects that are connected to source control?

Thank you!

[NorthEast]

In Pending Changes, you need to select Show Deleted Items - otherwise you won't see deleted files that need to be checked in.