blocks|key|2388942|text|我也犯了同样的错误，并以以下方式解决了它，注意，我叫我的分支为myBranchName.在git管理分支屏幕的visual+studio中，它只是一遍又一遍地显示错误。但是，我导航到windows中的文件夹，右键鼠标上下文菜单，并选择'git在这里‘打开bash+(您可以在同一个安装程序中安装GIT+for+windows+)在该文件夹中。然后我打字|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2388943|​|2388944|git+checkout+-b+myBranchName|code-block|syntax|javascript|2388945|2388946|然后按回车。这是没有错误的。然后我回到了视频工作室，它在屏幕右下角显示了myBranchName。|2388947|注意:这都假设您的“新分支名称”是一个现有分支，在我的示例中，当我收到该错误时，它是一个已经远程和本地存在的现有分支。如果这与你的问题不同，那么这可能/不会有帮助。|2388948|entityMap^0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|P|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Q|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|R|8|@]|9|@]|A|$G|H]]|$1|I|3|C|5|6|7|S|8|@]|9|@]|A|$]]|$1|J|3|K|5|6|7|T|8|@]|9|@]|A|$]]|$1|L|3|M|5|6|7|U|8|@]|9|@]|A|$]]|$1|N|3|-4|5|6|7|V|8|@]|9|@]|A|$]]]|O|$]]

I had this same error and solved it the following way, note I am calling my branch as myBranchName...
Within visual studio in the git-manage branches screen, it just shows that error over and over. But, I navigated to the folder in windows, right-mouse context menu and chose 'git bash here' to open bash (which you can install along with GIT for windows in the same installer), in that folder. Then I typed
<div class="snippet" data-lang="js" data-hide="false" data-console="true" data-babel="false">
<div class="snippet-code">
<pre class="snippet-code-html lang-html prettyprint-override"><code>git checkout -b myBranchName</code></pre>
</div>
</div>

and pressed enter. This worked with no error.
Then I returned to visual studio and it showed myBranchName in the bottom right of the screen.
Note: Also this all assumes your &quot;new branch name&quot; is an existing branch, in my case it was an existing branch that existed already remotely and locally when I got that error. If this is different from your question, then this may/may not help.

blocks|key|28717|text|这就是我解决这个问题的方法：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|28718|我们的原因是:我们重置了存储库的主分支，但是主分支只有初始的git文件。我们的其余工作被委托给一个备份分支，我们将通过一个拉请求合并该分支。在重置主服务器并将数据移动到新分支后，每当我们试图从备份分支将数据从远程/原点提取到visual+studio时，都会导致此异常。我们试图删除解决方案和重新下载，以及其他技术，但每一项都失败了。|28719|第一个解决方案:经过多次尝试，我在.vs中重新创建了一个.gitignore解决方案，并从备份中粘贴了.gitignore、Jenkins和Nuget文件。由于某种原因，在本地提交之后，我能够毫无例外地提取备份提交。|28720|第二个解决方案:考虑到可能与.gitignore、Jenkins、Nuget文件不同步有关，我决定再试一次。我再次从计算机中删除了存储库，并再次提取了存储库。我将.gitignore、Jenkins和Nuget文件复制并粘贴到主分支中，并在本地提交。在此之后，我再次能够在没有visual+studio抛出异常的情况下提取备份分支。因此，对我们来说，这与这些文件中的任何一个有关，或者出于某种原因，我们只需要对Master进行本地提交，然后它就允许我们提取任何其他分支。|28721|entityMap^0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|J|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|K|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|L|8|@]|9|@]|A|$]]|$1|F|3|G|5|6|7|M|8|@]|9|@]|A|$]]|$1|H|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|I|$]]

Here is the way I fixed this:
Our Cause:
We reset our repository's master branch, but the master branch only had the initial git file. The rest of our work was delegated to a backup branch that we were going to merge via a pull request. After resetting master and moving the data to the new branch, whenever we tried to pull the data from the remote/origin into visual studio from the backup branch, it caused this exception. We tried removing the solution and redownloading, and other techniques, but each one failed.
First Solution:
After many attempts, I recreated a .vs solution in Master and pasted the .gitignore, Jenkins, and Nuget files from the backup. For some reason after that local commit, I was able to pull the backup commit without the exception.
Second Solution:
Deciding that maybe it had something to do with either the .gitignore,Jenkins,Nuget files being out of sync, I decided to try again. I deleted the repository from my computer, again, and pulled the repository, again. I copied and pasted the .gitignore, Jenkins, and Nuget files into the master branch, and locally committed. Following that, I was once again able to pull the Backup branch without visual studio throwing the exception. So, for us, it had something to do with either one of those files, or for some reason we just needed to make a local commit on Master before it would allow us to pull any additional branches.

blocks|key|2389006|text|删除.suo文件。有关说明，请参阅下面的链接。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2389007|https://learn.microsoft.com/en-us/visualstudio/extensibility/internals/solution-user-options-dot-suo-file?view=vs-2022|offset|length|2389008|entityMap|0|LINK|mutability|MUTABLE|url^0|0|0|3A|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|N|8|@]|9|@$D|O|E|P|1|Q]]|A|$]]|$1|F|3|-4|5|6|7|R|8|@]|9|@]|A|$]]]|G|$H|$5|I|J|K|A|$L|C]]]]

Delete the .suo file.
See link below for description.
<a href="https://learn.microsoft.com/en-us/visualstudio/extensibility/internals/solution-user-options-dot-suo-file?view=vs-2022" rel="nofollow noreferrer">https://learn.microsoft.com/en-us/visualstudio/extensibility/internals/solution-user-options-dot-suo-file?view=vs-2022</a>

blocks|key|28740|text|以上的答案对我没有任何帮助。最后，我简单地将回购重新克隆到另一个文件夹，然后它又开始工作了。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|28741|如果删除suo文件什么都不做，并且尝试签出分支，只需要创建一个新的本地分支，只需重新克隆并节省自己的时间。|28742|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|F|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|G|8|@]|9|@]|A|$]]|$1|D|3|-4|5|6|7|H|8|@]|9|@]|A|$]]]|E|$]]

None of the above answers helped me. In the end I simply re-cloned the repo to a different folder and it started working again.
If deleting the suo file does nothing and trying to checkout the branch just has it create a new local branch instead, just re-clone and save yourself time.

blocks|key|2389078|text|我刚刚遇到了这个问题(VS+2022)。我的情况听起来非常类似于Patrick's，因此我将分享我是如何修复它的，以防它帮助到任何人：|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|2389079|在我的例子中，分支开关一开始看上去是成功的(实际上它还没有完成)，然后我立即开始收到上述异常。根据Git+Change工具栏，我试图添加一个存在于我来自的分支中的文件，而这个文件还没有出现在我要去的分支中。(注意，在一个分支中存在多个文件，而另一个分支不存在。但出于某种原因，这个特别的人把事情搞砸了。)|2389080|我所要做的就是：|2389081|2389082|将该文件从shell窗口的目录|ordered-list-item|2389083|中取出，切换回第一个分支，然后再次切换到第二个分支。在此之后，对我来说一切都很好，Visual停止抛出这个异常。|2389084|2389085|(对于那些不知道如何做到这一点的人，您可以从Tools+->命令行进入命令行。然后输入git+switch+branch_name，其中"branch_name“是您要切换的分支的名称，然后使用要切换到的分支的名称重复命令。如果进展顺利，则可以通过键入git+merge+branch_name将第一个分支合并为第二个分支，其中"branch_name“是您从其中切换的分支。|style|CODE|2389086|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/a/70498918/5460182^0|W|9|0|0|0|0|0|0|0|0|17|M|3I|L|0^^$0|@$1|2|3|4|5|6|7|10|8|@]|9|@$A|11|B|12|1|13]]|C|$]]|$1|D|3|E|5|6|7|14|8|@]|9|@]|C|$]]|$1|F|3|G|5|6|7|15|8|@]|9|@]|C|$]]|$1|H|3|-4|5|6|7|16|8|@]|9|@]|C|$]]|$1|I|3|J|5|K|7|17|8|@]|9|@]|C|$]]|$1|L|3|M|5|K|7|18|8|@]|9|@]|C|$]]|$1|N|3|-4|5|6|7|19|8|@]|9|@]|C|$]]|$1|O|3|P|5|6|7|1A|8|@$A|1B|B|1C|Q|R]|$A|1D|B|1E|Q|R]]|9|@]|C|$]]|$1|S|3|-4|5|6|7|1F|8|@]|9|@]|C|$]]]|T|$U|$5|V|W|X|C|$Y|Z]]]]

I just ran into this issue (VS 2022). My situation sounds very similar to <a href="https://stackoverflow.com/a/70498918/5460182">Patrick's</a>, so I'll share how I fixed it in case it helps anyone:
In my case, the branch switch looked successful at first (in reality it hadn't completed), and then I started receiving said exception immediately afterwards. According to the Git Changes toolbar, I was trying to add a file that existed in the branch I was coming from that wasn't present yet in the branch I was going to. (Note there were several files that existed in one branch but not the other. But for some reason, this particular one had tripped things up.)
All I had to do was this:
<ol>
<li>Take the file in question out of the directory</li>
<li>From the shell window, switch back to the first branch, then switch to the second branch again. After this, everything merged fine for me and Visual Studio stopped throwing that exception.</li>
</ol>
(For those that don't know how to do any of this, you can get to the command line from Tools -&gt; Command Line. Then enter <code>git switch branch_name</code> where &quot;branch_name&quot; is the name of the branch you're switching from, then repeat the command with the name of the branch you're switching to. If that goes well, you can then merge the first branch into the second by typing <code>git merge branch_name</code> where &quot;branch_name&quot; is the branch you switched from.

blocks|key|28673|text|我也面临着同样的问题，下面的步骤对我起作用。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|28674|28675|导航到本地系统|ordered-list-item|28676|中的\.git\refs\remotes文件夹，删除了导致|offset|length|style|CODE|28677|问题的分支，现在我使用git使用签出了分支。|28678|28679|entityMap^0|0|0|0|2|I|0|0|0^^$0|@$1|2|3|4|5|6|7|Q|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|R|8|@]|9|@]|A|$]]|$1|C|3|D|5|E|7|S|8|@]|9|@]|A|$]]|$1|F|3|G|5|E|7|T|8|@$H|U|I|V|J|K]]|9|@]|A|$]]|$1|L|3|M|5|E|7|W|8|@]|9|@]|A|$]]|$1|N|3|-4|5|6|7|X|8|@]|9|@]|A|$]]|$1|O|3|-4|5|6|7|Y|8|@]|9|@]|A|$]]]|P|$]]

I was also facing the same issue and the below steps worked for me
<ol>
<li>Navigated to <code>\.git\refs\remotes</code> folder in my local system</li>
<li>Deleted the branch that was causing the issue</li>
<li>Now i checked out the branch using git bash using <code>git checkout &lt;branchname&gt;</code></li>
</ol>

blocks|key|2389161|text|如果你有这个问题，你需要高层次的思考。当我试图切换到另一个git分支时，我遇到了这个问题，当它失败时，它真的很麻烦，并且回到原来的git分支。如果您在本地回购中没有太多的更改，我有一个简单的解决方案。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2389162|转到您的repos目录并删除给您此...GitCheckout的项目的文件夹.问题来了。显然，此解决方案将丢失您的本地回购中的任何更改，因此，只有在您刚刚签入的情况下才这样做。这可能是因为您只收到这条消息试图切换到另一个分支，您还没有在那里做太多的更改。检查您所坚持的分支的变更，然后尝试我的建议，没有什么错。然后再将该存储库克隆到本地回购程序中，然后从那里复制到您想要的git分支。要在VS+2019年中做到这一点，请选择"Clone+a+Repository“，并选择您想要克隆的高级别项目。您的中央git存储库没有什么问题，这条消息只是Visual中git资源和本地回购之间的一些同步问题，只有5名为Microsoft工作的人真正理解这一点。|2389163|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|F|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|G|8|@]|9|@]|A|$]]|$1|D|3|-4|5|6|7|H|8|@]|9|@]|A|$]]]|E|$]]

If you are having this problem you need to think high level. I got this problem when I was trying to switch to a different git branch and it was really fussing and going back to the original git branch when it failed. If you don't have a lot of changes in your local repo I have a simple solution for you.
Go to your repos directory and delete the folder for the project that is giving you this ...GitCheckout... problem. Obviously this solution will lose any changes in your local repo so only do this if you've just checked in. It may be that since you only get this message trying to switch to a different branch, you haven't made a lot of changes there yet. Nothing wrong with checking changes in for the branch you are stuck on and then trying what I suggest. Then clone that repository again to your local repo and go from there to the git branch you want. To do that in VS 2019 pick the &quot;Clone a Repository&quot; and pick the high level project you want to clone. There's nothing wrong with your central git repository, this message is just some syncing issue in Visual Studio between the git resource and your local repo that only 5 people who work for Microsoft really understand.

blocks|key|1606463|text|检查您的分支是否已被重命名。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1606464|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

Check to see if your branch was renamed.

blocks|key|2389294|text|以防万一:对我来说，解决方案是以管理员身份重新打开解决方案，并确保当您试图移动到另一个分支时，没有要保护的挂起的文件。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2389295|​|2389296|📷|atomic|offset|length|2389297|2389298|entityMap|0|IMAGE|mutability|IMMUTABLE|imageUrl|https://developer.qcloudimg.com/http-save/yehe-900000/9a4f7009e0c284b90800db3bad2b361c.png|imageAlt^0|0|0|0|1|0|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|T|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|U|8|@]|9|@$G|V|H|W|1|X]]|A|$]]|$1|I|3|C|5|6|7|Y|8|@]|9|@]|A|$]]|$1|J|3|-4|5|6|7|Z|8|@]|9|@]|A|$]]]|K|$L|$5|M|N|O|A|$P|Q|R|-4]]]]

Just in case: For me the solution was re-open the solution as administrator and make sure that you do not have pending files to protect if you are trying to move to another branch
<a href="https://i.stack.imgur.com/m41Lr.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/m41Lr.png" alt="No error message anymore" /></a>

blocks|key|28767|text|在我这方面，问题是源分支和目标分支之间的.gitignore内容不同。实际上，在.gitignore中定义的目标分支比在源分支(例如：*.suo)中定义的排它更多。这个提示来自这样一个事实:我在源分支上的.suo文件之前完成并推送，这是我在目标分支中很长一段时间没有做的事情。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|28768|下面是我应用的修复方法：|28769|28770|从目标分支|unordered-list-item|28771|获取.gitignore，用它代替源分支中的.gitignore，|28772|提交和推送源代码分支，|28773|关闭解决方案，|28774|打开解决方案。H+210F+211|offset|length|style|CODE|28775|28776|然后，可以不出错地切换到目标分支。|28777|entityMap^0|0|0|0|0|0|0|0|7|A|0|0|0^^$0|@$1|2|3|4|5|6|7|Y|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Z|8|@]|9|@]|A|$]]|$1|D|3|-4|5|6|7|10|8|@]|9|@]|A|$]]|$1|E|3|F|5|G|7|11|8|@]|9|@]|A|$]]|$1|H|3|I|5|G|7|12|8|@]|9|@]|A|$]]|$1|J|3|K|5|G|7|13|8|@]|9|@]|A|$]]|$1|L|3|M|5|G|7|14|8|@]|9|@]|A|$]]|$1|N|3|O|5|G|7|15|8|@$P|16|Q|17|R|S]]|9|@]|A|$]]|$1|T|3|-4|5|6|7|18|8|@]|9|@]|A|$]]|$1|U|3|V|5|6|7|19|8|@]|9|@]|A|$]]|$1|W|3|-4|5|6|7|1A|8|@]|9|@]|A|$]]]|X|$]]

On my side the issue was a difference of .gitignore content between the source branch and the destination branch.
Indeed the destination branch had more exclusions defined in .gitignore than in source branch (ex: *.suo).
This hint came from the fact that I commited and push just before the .suo file on source branch, what I was not doing from a long time in destination branch.
So here is the fix I applied:
<ul>
<li>get the .gitignore from destination branch</li>
<li>use it to replace the one in source branch,</li>
<li>commit and push source branch,</li>
<li>close the solution,</li>
<li>open the solution.</li>
</ul>
Then it was possible to switch to destination branch without error.

blocks|key|28805|text|您可以删除目录中的index.lock文件(C:/.(项目)/..git/index.lock)，然后添加一些更改(例如，任何行上的空格)，然后推送提交。看起来不错|type|unstyled|depth|inlineStyleRanges|entityRanges|data|28806|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

You can delete index.lock file in your directory(C:/...(your project)/.git/index.lock), then add some changes(space on any row for example) and then push commit. It will work

While trying to checkout to a new branch in Visual Studio 2019, I'm getting the below error:
<a href="https://i.stack.imgur.com/2me3e.png" rel="noreferrer"><img src="https://i.stack.imgur.com/2me3e.png" alt="enter image description here" /></a>
I tried to do the same from <code>GitBash cmd</code> using the command <code>git checkout branchname</code> but here also, I'm getting an error:
<pre><code>error: The following untracked working tree files would be overwritten by checkout:
//list of file names below
...
...
...
Aborting
</code></pre>
I tried restarting VS also but it was of no help. Can you please assist?

Exception of type 'Microsoft.TeamFoundation.Git.Contracts.GitCheckoutConflictException' was thrown

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

腾讯iOA零信任安全管理系统专区

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋 

腾讯云代码助手

CODING DevOps

Cloud Studio

SDK中心

API中心

命令行工具

在尝试签出Visual 2019年中的一个新分支时，我得到了以下错误：​我尝试使用命令GitBash cmd进行同样的操作，但是在这里，我得到了一个错误：error: The following untracked working tree files would be overwritten by checkout:...

问引发'Microsoft.TeamFoundation.Git.Contracts.GitCheckoutConflictException‘类型的异常
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问引发'Microsoft.TeamFoundation.Git.Contracts.GitCheckoutConflictException‘类型的异常EN