问题描述
您好,
我们有一个项目,其中不同的模块使用不同的语言编码(ATL C ++,VBA和C#)。
We have a project where different modules is coded in different languages (ATL C++, VBA and C#).
我们将整个项目保存在Azure Devops Git仓库中,我们使用Visual Studio 2017团队资源管理器来维护仓库。
We keep the whole project in a Azure Devops Git repo, and we use Visual Studio 2017 Team Explorer to maintain the repo.
但是我们最近在冲突后合并VBA代码时遇到了一些问题。使用Visual Studio手动处理合并冲突。
But we have recently had some issues when merging VBA code after conflicts. The merge conflicts were handled manually with Visual Studio.
在处理并提交合并后,VBA代码有一些神秘的破坏性修改。
After the merges were handled and committed the VBA code had some mysterious corrupting modifications.
查看此我发送到stackoverflow的问题:
See this question which I sent to stackoverflow:
https://stackoverflow.com/questions/54482681/diff-and-merging-of-vba-in-visual-studio-2017
我的问题是,vsDiffMerge.exe工具是否根据VB.NET解释和修改VBA代码,这在语法上类似于什么?
My question is, does vsDiffMerge.exe tool interpret and modify the VBA code according to a VB.NET, which is syntaxically resemble?
Br,
Johan Ahlqvist
Johan Ahlqvist
推荐答案
欢迎来到MSDN论坛。
Welcome to the MSDN forum.
参考说明,这个问题是关于Source Control和VBA开发的,我们的论坛是讨论VS IDE,因为你已经打开了同样的问题在带有相应标签的stackoverflow上,请关注您的前置vious线程并等待
获得更好的支持或者看一下这个论坛:。
Refer to the description, this issue is about the Source Control and VBA development, our forum is to discuss the VS IDE, since you have already open the same issue on the stackoverflow with the appropriate tag, please focus on your previous thread and waiting for better support or have a look at this forum: https://social.msdn.microsoft.com/Forums/en-US/home?forum=isvvba.
很抱歉给您带来不便,非常感谢您好!理解。
Sorry for this inconvenience and thank you for your understanding.
祝你好运,
Sara
这篇关于vsDiffMerge.exe如何处理VBA代码?的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持!