Trouble Merging Braches

emarthinsen · Post by **emarthinsen** » Mon Apr 11, 2005 7:13 pm

Hello-

I have a project called "Proj" in my repository (called "ClientProjects") that I branched about a month ago to do some very invasive edits to. I branched it into a project called "Proj_V2". Now that the edits are done and successful, I want to merge Proj_V2 back into Proj. So, I'm firing up the merge wizard, selecting Proj_V2 as the origin and Proj as the target. The problem is that merge doesn't seem to merge everything over. Specifically, I'm having trouble with subdirectories. I added several subdirectories to Proj_V2 and I can see the "Create Subdirectory" item in the list of pending changes and see in the after-merge log that it created then, but Proj remains unchanged. Does anyone know what mght be going on? Is there something about merging that I don't understand?

Regards-
Eric

P.S. - I'm using the latest version 3.0.6

ericsink · Post by **ericsink** » Tue Apr 12, 2005 7:22 am

Have you committed the changes from the merge?

The Merge Branches wizard leaves all changes in the pending change set. The process is not complete until you Commit those changes to the repository.

emarthinsen · Post by **emarthinsen** » Tue Apr 12, 2005 6:06 pm

Eric-

Thanks. That was the problem.

Regards-
Eric