English 中文(简体)
与 TFS 的奇怪的合并结果
原标题:Strange merge result with TFS

我从TFS的主要分支创建了一个分支。

主要分支有一些更新(新文件),所以我想把这些合并到分支。

合并后, 主分支中新建的文件没有合并 。

为什么会这样?

这些是主要分支的新文件。

问题回答

听上去很亲切 我记得我们遇到一个问题

可能您没有权利在您合并 < br/ br/ > 之后做什么。 当您合并 < em> 存在 < / em > 文件时, 您可以在“ 正在修改” 窗口中看到动作是“ 合并, 编辑 ” 。 < br/ > 当您合并 < em> new < / em > 文件时, 您可以看到“ 合并, 分支 ” 。 < br/ br/ > 要完成后的文件, 您的用户必须同时设置“ 管理分支” 权限 。 为了检查这一点, 请右键单击源控制探索器中的分支, 选择“ 属性”, 然后“ permissions” 。 < br/ {br/ > (可能有用的另一个提示: 如果您的“ new < / em” 文件是二进制( DLL, PNG), 动作“ lock” 也包含 - 因此“ Lock” 权限也必须设置在此情况下 。





相关问题
Anyone feel like passing it forward?

I m the only developer in my company, and am getting along well as an autodidact, but I know I m missing out on the education one gets from working with and having code reviewed by more senior devs. ...

NSArray s, Primitive types and Boxing Oh My!

I m pretty new to the Objective-C world and I have a long history with .net/C# so naturally I m inclined to use my C# wits. Now here s the question: I feel really inclined to create some type of ...

C# Marshal / Pinvoke CBitmap?

I cannot figure out how to marshal a C++ CBitmap to a C# Bitmap or Image class. My import looks like this: [DllImport(@"test.dll", CharSet = CharSet.Unicode)] public static extern IntPtr ...

How to Use Ghostscript DLL to convert PDF to PDF/A

How to user GhostScript DLL to convert PDF to PDF/A. I know I kind of have to call the exported function of gsdll32.dll whose name is gsapi_init_with_args, but how do i pass the right arguments? BTW, ...

Linqy no matchy

Maybe it s something I m doing wrong. I m just learning Linq because I m bored. And so far so good. I made a little program and it basically just outputs all matches (foreach) into a label control. ...

热门标签