tfs2010 - TFS 2010 Hotfix Branch/Merge Strategy without baseless merge? -

i trying understand how work branching , merging in team foundation server 2010. strategy below web development team.

my idea have 5 folders. main folder, development folder, qa folder, production folder , hotfix folder. main folder consist of main branch. developer either work directly in main branch or create new branch in development folder , merge main branch when done. when want create release version promote main branch qa 1.0.0 branch. when branch stable promote branch production branch 1.0.0. production branch becomes read only, , qa branch merge main branch. use qa 1.0.0 branch example branching hotfixes. example here after qa branch goes production find bugs. promote qa branch 1.0.0 hotfix 1.0.1 branch. when hotfix branch stable promote production branch 1.0.1. when new bug found in production 1.0.1 branch create new hotfix 1.0.2 branch hotfix 1.0.1 branch. when branch stable promote branch production branch 1.0.2. works in team foundation server 2010.

the problem have , don't know how solve in way in tfs 2010 how promote hotfix main branch. don't want merge hotfix qa 1.0.0 branch since might need create different hotfix different customer qa branch 1.0.0. need merge hotfix 1.0.1 branch directly main branch.

i understand can solve baseless merge using command line tool. way go? there other better suggestions how solve want accomplish,? ui tools? appreciate input if branching/merging strategy want use somehow improved.

i understand why don't want merge through qa branch, think comes assuming have branch latest revision. if need create second hot fix can branch original version of qa 1.0.0.0, not latest version using older version of code. don't have branch tip.