Merge Oddity

[Noble Bell]

I done some merge branches the other day and everything seemed to have went fine. But when I look at my code in the branch I merged to I have noticed that there is a bunch of code missing that *should* have been merged from the other branch. Any thoughts on how I can resolve this?

[Beth]

Was the line of code in the Origin or Target file?

A quick way to resolve this is to use Diff to merge the piece back in. Go to your Vault Tools - Options - Diff/Merge. In the connect string you will see something like /ro1 and /ro2. Those are read-only flags. You can remove those on one or both of the panes and then they become writable and you can merge code between the windows. Then perform a diff that will be between either your working folder and the last version retrieved from Vault, or use history to diff against the historical version. From there you can edit the panes.

[Noble Bell]

Ok. That seemed to work for me. But I have about 50 files that I am going to have to visit one-by-one and do this on. Why do I have to do this? The merge said it worked but when looking at the trunk code that I merged to the code is not there. What causes this so I don't make the same mistake again?

I made my bug fixes in the release branch.
I then went through the steps in the merge feature to merge the release branch to the trunk code. (Everything seemed to come off without a hitch.)
Checked everything back in. (No errors there either)
Started testing my trunk code to make sure the bugs were fixed and that is when I started noticing that they were not.
Started looking at the trunk code and at the release branch code and noticed that the code did not get merged at all.

I am using version 4.1.2 (18185) of the client and server.

[Beth]

I think taking a closer look will help me see what happened better. Could you send an email to support at sourcegear.com (attn: Beth) with a link to this forum thread?