How to delete folders and files added to source control by mistake in a branch?

[Aris]

Hello,

 

I have added to source control by mistake NEW some folders and files in a wrong branch (instead of adding them in a child branch) and I would like to revert this situation, delete the folders/files from the parent wrong branch and add to source control them in the correct one. The changeset created in the parent wrong branch is currently the last changeset of the branch.

 

Please find attached an example image file.

 

What would be the best way to solve this issue?

 

Thanks in advance.

[calbzam]

Hi,

 

You could just cherrypick/merge the desired changeset and integrate in the correct branch.  Finally, you could deintegrate the changeset from the wrong branch running a subtractive merge operation.

Please, let me know if it helps.

 

Regards,

Carlos.