Merge Braches didn't pick up the change

[yamao]

Hi All,

I have a branch1 and branch2, they both have file abc.ascx. the ONLY change I made is a label's visible property to false in abc.ascx of branch2 and try to merge to branch1(there is no change in this branch), the branch merge showed no conflict and the pending change is commited. The problem is the change was no made in the target folder at all.

Help please!

Thanks!

Amy

[lbauer]

What version of Vault are you using?

Did you commit the changes in your pending change set? During a merge, changes to the target generally are put into the pending change set, and are not automatically committed.

[yamao]

Hi there,

I did mention that I commited the peding change set. My Vault version 4.1.2

Thanks!

[Beth]

the ONLY change I made is a label's visible property to false in abc.ascx of branch2 and try to merge to branch1(there is no change in this branch),

Could you show a screenshot of what you changed?

After that change, did you have an item in your pending change set that you had to commit, or did you need to check out and check in? The change I think needs to actually create a changeset, and some things, such as just editing a comment, don't make a change set. When you are merging, it's the changesets that are collected to apply to the branch.

When you went to merge, how many changes were listed? Did you have more than just the one property change?