Possible bug in Show Merge after branch merge

[jstarbird]

Vault 5.0.1

I had a conflict during my merge and I selected the item from the Pending Change Set area, right clicked and selected Show Merge. Once I resolved the conflicts and clicked OK on the "Would you like to resolve the Merge Status now?" dialog I get the Commit dialog but there is nothing listed for me to Commit so I have to Cancel this dialog and commit from the Pending Change Set area.

If I go a different route, select to Commit first and then select Merge from the Warning dialog that comes up then when I get to this Commit dialog the items are listed correctly.

I was able to reproduce it every time I tried it.



Thanks,
J

[Beth]

I think we're missing a step here. I don't one gets a commit dialog from performing a Show Merge. After the Resolve Merge Status window, there's a warning about the file going to an edited status and then it sits in pending changes.

It might be better if I could see it in action. Would you be able to post screenshots of your process? If you prefer, you can an email to support at sourcegear.com (attn: Beth) with a link to this forum thread and we'll take this offline so I can take a closer look.

[jstarbird]

Sure thing. I'll get those together for you and email them a bit later today.


Thanks,
J

[jstarbird]

Beth,
I went back to repeat my steps and this time I did not get the empty Commit dialog. If I get it again sometime I'll ping you all again.


Thanks,
J

[Beth]

Thank you for the update.