简体繁体 English

将Git存储库中的更改合并到TFVC分支

[英]Merge changes in a Git repo to TFVC branch

原文 2018-06-05 09:52:41 0 1 git/ merge/ tfvc

I understnad how to work with Git repos and TFVC, I understand that in TFS 2018, we can have 1 TFVC a nd 1 or more Git repos. 我了解如何使用Git存储库和TFVC，我了解在TFS 2018中，我们可以拥有1个TFVC和1个或更多Git存储库。 In case 1 team continues to work on TFVC and another team works on Git repos, is possible or how merge changes dont in the Git repo to the TFVC main branch? 如果有一个团队继续在TFVC上工作，而另一个团队在Git仓库上工作，那么是否可能，或者如何在Git仓库中合并更改不到TFVC主分支？ Thanks 谢谢

1 个解决方案

This isn't built in functionality, TFVC and Git are 2 completely separate version control systems with very different paradigms, ie TFVC is a centralized VCS and Git is Distributed. 这不是内置的功能，TFVC和Git是2个完全独立的版本控制系统，具有非常不同的范例，即TFVC是集中式VCS，而Git是分布式的。

You can integrate them however you'll need to use one of the following. 您可以集成它们，但是您需要使用以下方法之一。

git-tfs a 3rd party product that provides good integration. git-tfs提供良好集成的第三方产品。 This only works on windows 这仅适用于Windows

git-tf microsofts integration tool. git-tf微软集成工具。 It's cross platform and runs on Windows, MacOS and Linux however is less featureful than git-tfs 它是跨平台的，可以在Windows，MacOS和Linux上运行，但是功能不如git-tfs

If you need simple integration then either should suffice, however note that both of them are designed to allow users to follow a git workflow locally whilst integrating with TFVC. 如果您需要简单的集成，那么任何一个都足够，但是请注意，它们两者都旨在允许用户在与TFVC集成时在本地遵循git工作流程。

Ultimately, if teams are expected to develop on the same code-base, on a regular cadence, then they are probably better off using the same repository. 最终，如果期望团队以相同的节奏和常规的节奏在相同的代码库上进行开发，那么他们最好使用相同的存储库。