A QA branch is not recommended. Produce a build, then tag/label with the version number and release to QA. Or did I misunderstand what you're talking about?

>That's one of ways modern VCS's make life easier. Typically there will be a Release branch and a Development branch. Some have a separate QA branch. Getting what is included in a given release is one command away.
>
>BTW: Beyond Compare, which Tamar mentioned, is thought by many (and myself) to be the best merge/diff tool available (especially the pro version, which shows you the result of what you are pick/choosing/editing as you go through the conflicts).
>
>Hank