Merge Stopped Working for Me

[imnlfn]

I sent an email to SourceGear support about this yesterday morning, but since I haven't received so much as an acknowledgment of receipt, I figured I would post here, too.

This was the text of my email:
"The Merge Branches function isn't working properly for me anymore. The Merge Tool itself seems to work fine; the problem arises when I attempt to resolve the merge.

If I right-click on a merged file and select "Show Merge...", I see the Merge Results window and I can make changes there as I see fit. The thing is, if I then save those changes and close the window, it then asks me if I would like to resolve the merge status. No matter whether I click "Yes" or "No", the merge status stays the same. Also, in either case, the changes I made in the Merge Results window are not reflected in the working file (though the results of the automatic merge are).

Having some merge functionality available is certainly preferable to doing the whole thing manually, but I'd still like to make use of all the tools as they were intended, since I now have to do a reasonable amount of manual work again."

I went ahead and resolved the merges manually (usually by opening each file and forcing the current contents to be saved) and it actually didn't take as much time as I thought it would, though it certainly would be preferable for Vault to work as designed. Moreover, for this reason, I also don't currently have anything to take screenshots of, though if necessary I could make some more changes to the branch and merge those to the trunk again.

Any ideas?

Vault Client Version: 4.1.4.18402
Vault Server Version: 4.1.4.18402

Thanks!
Matt

[lbauer]

Is this not working on a particular merge or on any merge?

Are you saving the file after you make changes to the center pane?

Turn on client side logging -- it may give us more clues to what's going on.

http://support.sourcegear.com/viewtopic.php?t=1534

Send the log to support@sourcegear.com with a link to this forum post.

Please put your case number at the end of the subject line: {214786}

[steve.welsh]

Can anyone tell me if this post has been resolved? Whilst we have been using Vault for a few year, we have only recently started to make use of the branching/merging facilities and have experienced exactly the same problem as described in this thread.

Our Vault server and client are at version: 3.5.3.5169

Thanks.

[lbauer]

The merge worked differently than the user expected.

Once a merge branches has completed, and a file is in a Merged status, you can't further make changes by using the Show Merge function. Only one merge is supported, and that is done. If you wish to modify the file further, you can do so manually, or use the Diff tool to compare the file to another version of the file and make additional changes.

If you'd like us to look at your particular situation more closely, Email sourcegear.com, Attn: Linda with the details. Please include a link to this forum post.