Merging

MBlack · Post by **MBlack** » Fri Jun 03, 2005 9:52 am

Somehow my Vault Repository (v. 3.0.5) is conflicting with my local copy and is requesting an assisted merge on a few files. Those files are the latest version and I don't care what the repository says, I just want to put up my local files and call it the latest version. I don't want a merge.

How can I do this when Vault insists on resolving a merge conflict?

Thanks.

GregM · Post by **GregM** » Fri Jun 03, 2005 11:06 am

You can use "Resolve Merge Status" to tell Vault that you've already taken care of the merge.

MBlack · Post by **MBlack** » Fri Jun 03, 2005 11:24 am

Thank you! I saw that option but I didn't understand what it would do.