I have a branch, (BranchA) and I want to re-integrate it into trunk.
but somehow, (almost certainly because of something I did), trunk is now a huge mess with 1000 of conflicts, (almost all of them 'tree' conflicts).
So now I want to merge BranchA into trunk, no questions asked, whatever file is in BranchA then it must be added/merged into trunk, whatever directory/file does not exist should be deleted.
Or, if I do a merge I want all the conflicts to be resolved with , "use theirs".
Even better would be to manually copy the files, delete whatever needs to be deleted and mark trunk as 'merged up' to branchA revision.
Any sugestions on how I could rescue my trunk?