Eclipse中的TFS比较（从左到右不能复制） [英] TFS Compare in Eclipse (can't copy from left to right)

问题描述

我在Eclipse中有一个TFS的问题。它的工作非常好，但是当我尝试登录时，我被通知我发送的文件与存储在服务器上的文件有冲突，我无法从左侧（本地文件）将更改复制到右侧（服务器）在比较窗口。我只能从右到左复制，并且选项从左到右复制全部和从当前更改从左到右复制是灰色的。

是否有我在这里缺少一些东西？

或者也许是这样的：我在左边进行更改，左边（本地）版本被签入，但如果那么为什么开始时提交按钮是灰色的？

Lucas

解决方案

不，您无法更改服务器版本，您只能对本地版本进行更改。服务器版本（右侧）只是查看服务器上的内容，与您的位置版本冲突。您可以从服务器中进行一些更改，从右到左进行复制，这将更新您的本地文件，然后您可以登录。但服务器的版本是不可变的，您需要检查您的更改以更新

您正在左侧进行更改，但您的左（本地）文件尚未登录 。您需要解决冲突与之前的服务器版本，这将涉及退出这些服务器更改或接受他们。

提交按钮（令人失望的标签，因为它实际上没有提交你的对服务器的更改 - 它真的是一个保存本地内容按钮，但我们不能覆盖标签）将变灰，直到您对左侧（本地）进行任何更改，因为没有实际保存。

抱歉的混乱。不要忘记，您可以配置外部比较和合并工具以在解决冲突时使用 - 我发现一个标准的左/中/右三向合并窗口比Eclipse三维合并更直观。但这是一个偏爱的问题。

I have a problem with TFS in Eclipse. It's working great, but when I try to check in, and I am notified that the file I'm sending has conflicts with the one stored on the server, I can't copy the changes from left(local file) to right(server) in comparison window. I can only copy from right to left, and options "Copy all from left to right" and "copy current change from left to right" are greyed out.

Is there something I'm missing here?

Or maybe it's like this: I'm making changes on the left, and the left(local) version is checked in. But if that's the case, then why the commit button is greyed out at the beginning?

Lucas

解决方案

No, you can't make changes to the server version, you can only make changes to your local version. The server version (the right side) is simply a view of what's on the server, conflicting with your location version. You can take some of those changes from the server, copying from right to left, which will update your local file and you can then check in. But the server's version is in a changeset that's immutable - you need to check in your changes to update.

You are making changes on the left, but your left (local) file is not yet checked in. You need to resolve the conflicts with the server version before that happens, which will involve either backing out those server changes or accepting them.

The commit button (disappointingly labelled, as it does not actually commit your changes to the server - it's really a "Save Local Contents" button but we cannot override the label) will be grayed out until you make any changes to the left (local) side as there's nothing to actually save yet.

Sorry about the confusion. Don't forget that you can configure external compare and merge tools to use when resolving conflicts - I find a standard left/middle/right three-way merge window to be far more intuitive than the Eclipse three-way merge. But this is very much a matter of preference.

这篇关于Eclipse中的TFS比较（从左到右不能复制）的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！