Hi,
I have create a branch for my project for maintenance purpose. I did some changes in my maintenance copy and check in. VSS just check in file without any prompt.

Now, I go to made another changes in my original project and check in. It also just checked in.

How come VSS never show conflict?

Ok, then I try to merge from maintenance copy. VSS doesn't merge. I got to merge using original copy. Why?

If I have finished all bug fixes for maintenance copy. I need to deploy latest version using my original copy. How could I "un-branch" the branched project?

When I want to deploy latest version using my original copy, how could I know what files need to be merged from maintenance project?

What is the correct procudere to manage branch/merge?

Thank you