How do i remove files from the Pending Changes list in TFS when those files have been deleted locally

As far as i understand, merge specifically means that its this revision contains the merge from a another branch. however, i think merge -only- represent the merge operation.

If a particular file is diffrent in the two branches the file will have the status "merge, edit" because it is both merged from the branch and changed content-wise.

So in other words, if you have a main-branch with 2 files, make a dev-branch of that, make a change in one of the files only and then to a merge, the pending changes on the main-branch should look like this:

FileA.cs > merge
FileB.cs > merge, edit

Don't delete. Once you "add" them to TFS, it creates an entry in the database just waiting for the files. Instead, undo your "add."

That's actually how to fix this problem as well.

Right click on any source file in the source explorer, and choose Undo Pending Changes. Uncheck everything except for the two files that you need to get rid of the add. Click OK to undo those changes.

That will clean up everything in the TFS database.