How to stop tracking and ignore files in RTC?

Hi,
Background information
- We are using RTC as out version control tool and use it in this way:
- Two teams (SW and QA) have their own stream inside RTC
- QA stream has the same folder structure as the SW stream (it was created as a fork) and should only inlcude test file and files needed for testing, sadly there are still some historical source code files left by the fork
- Up until now the QA team's workflow was:
- Create workspace from a specific snapshot of the SW stream
- Change flow target and accept the newest chages from the QA stream
- Deliver new change sets to the QA stream
Problem:
- Accidentaly one changest to QA stream included some source files, they were deleted in the next change set
- Now when changing flow target and accepting changes the RTC will display merge errors
Now to the main question.
Is there a way to ignore source file (using .jazzignore) and also remove (stop tracking) source files from QA stream to get rid of the merge conflicts that way?
Hope my explanation was understandable.
Thank you for your answer
Jakub
One answer

I can only provide https://jazz.net/library/article/126
You can ignore files using .jazzignore, but you can not undo a file being shared. If the files were deleted later, they will no longer appear when downloading, but they will stay in the history.
There is some capability to delete change sets/file versions. I have not played with it and do not know, what happens if you delete them. I would think they will disappear from everywhere.
If you have merge conflicts, I think you will have to solve those problems before you can continue.