TFS 2013 - 解决冲突时没有合并选项 [英] TFS 2013 - no option to merge when resolving conflicts

问题描述

在将我们所有的源移动到那里之前，我正在用 TFS 做一些测试.现在，我创建了一个非常简单的解决方案，并设置了两个工作区，一个在本地，一个在服务器中.

I'm doing some tests with TFS prior to moving all of our source there. Right now, I've created a very simple solution and I've set two workspaces, one local and one in the server.

对于上一个版本的两个工作区，我在服务器工作区中进行了一些更改并将它们签入.然后，我在本地工作区中进行了一些其他更改，并且我也尝试将它们签入.当然，存在冲突，但我只能选择保留本地更改或从服务器获取版本.我希望看到合并不同更改的选项.

With both workspaces on the last version, I've made some changes in the server workspace and checked them in. Then, I've made some other changes in the local workspace and I've tried to check them in too. Of course, there is a conflict, but I only get the option to keep the local changes or take the version from the server. I would expect to see an option to merge the different changes.

我很确定我以前看过合并选项，在我前段时间做的其他一些测试中......

I'm pretty sure I've seen the option to merge before, in some other tests I did some time ago...

有什么解决办法吗?我做错了什么吗?

Any solutions? Am I doing something wrong?

更新:我点击了注释"按钮，它告诉我它无法完成，因为文件 TestApp.cpp 是一个二进制文件(错误 TF206000).也许我应该补充一点，我已经通过 git-tf 从 git 移动了文件.但是，我计算机上的文件看起来不错，ANSI 编码，带有 CRLF 行结尾，并且记事本 ++ 或我在其中打开的任何其他编辑器中没有奇怪的字符...

UPDATE: I've clicked in the "Annotate" button and it tells me it can't be done because the file TestApp.cpp is a binary file (Error TF206000). Maybe I should add that I've moved the files from git via git-tf. However, the file on my computer seems fine, ANSI-coded, with CRLF line endings, and no strange looking characters in notepad++, or any other editor I've opened it in...

更新 2:
回答 MartW 的评论:服务器上的文件与我的 PC 上的文件看起来一样.好吧，似乎存在一些编码问题，因为重音未正确显示.此外，它不允许我通过浏览器注释服务器上的文件，出现此错误:有效值介于 0 和 65535 之间，包括在内.参数名称:代码页".

UPDATE 2:
Answering MartW's comment: The file on the server looks the same as on my PC. Well, there seems to be some encoding issue, since the accents are not shown properly. Also, it doesn't let me annotate the file on the server through the browser, with this error: "Valid values are between 0 and 65535, inclusive. Parameter name: codepage".

我已经检查了版本，我可以注释文件出现的第一个版本.其余的都给出了同样的错误.

I've checked through the versions, and I can annotate the first one where the file appears. All the rest give the same error.

推荐答案

好的，我想我找到了.显然，TFS 已经决定我所有的文件都是二进制文件.通过转到源代码资源管理器，选择文件，打开上下文菜单并选择高级|属性，我已经能够更改编码(实际上，如果我告诉它自动检测它，它就可以了)现在我可以合并...
现在，我必须找到如何一次更改所有文件(好吧，只是文本文件)的编码.

OK, I think I found it. Apparently, TFS has decided that all my files are binary files. By going to the Source Code Explorer, selecting the file, opening the context menu and selecting Advanced|Properties, I've been able to change the encoding (actually, if I tell it to auto-detect it, it does it just fine) and now I can merge...
Now, I have to find how to change the encoding of all the files (well, just text files) at once.

这篇关于TFS 2013 - 解决冲突时没有合并选项的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！