"Show Merge..." is disabled?

potiguar · Post by **potiguar** » Tue Feb 26, 2008 6:41 am

I'm using Vault 4.1 in CVS Style with VS 2008 enchanced client and can't understand the reason why the "Show Merge..." option is always disabled in the Vault Pending Checkins window. How do I invoke a merge for a changed file?

potiguar · Post by **potiguar** » Tue Feb 26, 2008 6:55 am

Uh.. I kinda found out myself. I changed the option on diff to "diff against the current version in the repository now" instead of "diff against the last version retrieved from the repository" and the show merge option appeared.

I cannot help but wonder why is the first option the default? Do most people prefer to diff against the last version retrieved? Can't see when that would be useful at all.

ian_sg · Post by **ian_sg** » Tue Feb 26, 2008 8:55 am

Show Merge is enabled when a file is in a needs merge state, but not when a simple change has been made.

potiguar · Post by **potiguar** » Tue Feb 26, 2008 9:24 am

You're right, it does work perfectly now. Odd thing it really wasnt being enabled before.

I think what happened the first time around when the "Merge" option was never enabling up (even though the files were completely different in the repository, I mean, positive defnite conflicts) is that I had copied some files from somewhere else, overwriting the ones downloaded from the repository. I did that because some people were still working on the old version during migration and I was trying to merge these changes into the repository...

Thanks.