[英]How do I “Take Source Branch Version” for all conflicts in TFS 2008 on Visual Studio 2010?
The closest thing I see to what I want is "AutoResolve All". 我看到的与我想要的最接近的东西是“全部自动解决”。 I don't want to AutoMerge though. 我不想自动合并。
In Visual Studio 2008 I could say I wanted to have the source override on all or the target on all. 在Visual Studio 2008中,我可以说我想对所有源都覆盖源,或者对所有目标都覆盖源。
Where is this option in 2010? 2010年该选项在哪里? Did they take it away? 他们拿走了吗? It looks like my only option is to click "Take Source Branch Version" on all 70 files one by one. 看来,我唯一的选择是在所有70个文件中单击一个“ Take Source Branch Version”。
Check out the TF.EXE command here . 在此处签出TF.EXE命令。
tf.exe resolve ..... /auto:TakeTheirs
will "Take Source Branch Version." tf.exe resolve ..... /auto:TakeTheirs
将“获取源分支版本”。 My suggestion is to do the resolve, then check your branch and make sure that you have what you expect before you check in. 我的建议是进行解决,然后检查您的分支机构并确保在签入之前具有所需的功能。
tf.exe resolve .... /auto:KeepTheirs
will "Keep Target Branch Version" tf.exe resolve .... /auto:KeepTheirs
将“保留目标分支版本”
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.