开发者

How do I keep a local version of a conclicted file in TFS?

开发者 https://www.devze.com 2023-01-22 03:53 出处:网络
I did a Get All from my TFS server, and there are a few dozen conflicts. I\'d like to keep the local versions of these files, but the only option I\'m 开发者_如何学Pythongiven is \"Overwrite Local Ver

I did a Get All from my TFS server, and there are a few dozen conflicts. I'd like to keep the local versions of these files, but the only option I'm 开发者_如何学Pythongiven is "Overwrite Local Version". How do I tell it to keep my local copy?


TFS will try to merge the changes automatically. If it is unable to do so, then it will have show there is a conflict. Typically you'll see an option for the overwrite with server version, keep local version, or do a manual merge of the changes.

0

精彩评论

暂无评论...
验证码 换一张
取 消