We are currently evaluating Vault as a replacement for VSS.
We have recently had an issue whereby Vault has attempted to merge two different changes, made separately by different developers to a project file. This has resulted in us loosing both changes. (Fortunately it was simply adding forms to the project).
Is it possible to set Vault to NEVER attempt to merge changes, and ALWAYS prompt to overwrite a changed file, as VSS does by default? We have set this individually in our preferences but it seems to revert back to 'merge' all the time.
Thanks!
Never want to merge
Moderator: SourceGear
Where you are setting that behavior in your client options is correct. I haven't run into a time yet where the options didn't stay set. If you want to dig into that further, then please document details for me.
If you would like, I can also put in a feature request for setting that behavior to be part of the Admin tool.
As far as losing any changes, any file that Vault cannot recreate will be backed up into a backup folder, so you still have that work, it's just not as readily apparent. These are saved in a folder named “_sgbak” within the working folder of the file being backed up. This option can be turned off as well in your Local Files under Vault Options.
If you would like, I can also put in a feature request for setting that behavior to be part of the Admin tool.
As far as losing any changes, any file that Vault cannot recreate will be backed up into a backup folder, so you still have that work, it's just not as readily apparent. These are saved in a folder named “_sgbak” within the working folder of the file being backed up. This option can be turned off as well in your Local Files under Vault Options.