Help! - How to disable merge

[wellskw]

I really, really need to disable merge. It is driving me insane. I Show Merge and say Yes to set it to edited. I then either check it in or check it out and then check it in and it still shows "edited". I do a "diff" and indeed it is still different than on disk. I then check it in a again and then there are no differences, but it still shows "edited".

We are not doing simultaneous development so I just want it disabled. I searched the kbase and found an entry about disabling multi-user check outs (or something like that) in the admin tool but cannot find that option. Could you please tell me how to turn it off?

Thanks,
Kenny

[Beth]

To make merge less likely to happen, you can require exclusive locks. Go to the Vault admin web page. On the left, click on the repository you are working with. In the right-side pane will be a few options, one of which is the option to require exclusive locks.

When you performed your merge, did you perform a show merge, or did you perform a resolve merge status?

Are you checking in using the IDE integration in VS or the Vault GUI client? If you are using the GUI client, then after trying to check it in, go to the messages tab at the bottom of the Vault window. I might not be completing the check-in, and the messages pane will tell you why.

[wellskw]

Thank you for a quick follow up. My responses below. Kenny

>To make merge less likely to happen, you can require exclusive locks. Go to the Vault admin web page. On the left, click >on the repository you are working with. In the right-side pane will be a few options, one of which is the option to require >exclusive locks.

"Exclusive locks" was already checked. I do not want "less likely". I want it to never even think about merging.

>When you performed your merge, did you perform a show merge, or did you perform a resolve merge status?

As mentioned, I did a "show merge" so that I have the option to change status to "edited".

>Are you checking in using the IDE integration in VS or the Vault GUI client? If you are using the GUI client, then after >trying to check it in, go to the messages tab at the bottom of the Vault window. I might not be completing the check-in, >and the messages pane will tell you why.

I'm using the Vault GUI client. The messages all say successful. Can you tell me how to disable merge completely? It causes a lot of pain to have to go thru so many steps for so many programs everytime. I simply want to check the file on disk into the repository. Straight-forward. Let me know and thanks again.

[Beth]

You have something more going on here if you can't check in an edited file. Could you close all instances of Vault and Visual Studio, then reopen Vault? Then look at the file. Is the status still set to Edited?

We don't have a way to completely end merging. Most users don't end up with merges when they use exclusive locks, but I only say "less likely" because there's a chance you could find a way to make it have a Needs Merge status. Also, I would expect that there's a way to put your files into a Needs Merge status with the shelve feature if you're working with old shelves.