奇怪的文本被添加到我的 SVN 提交中。
这是一个示例：
private void btnUndo_Click(object sender, EventArgs e)
{
<<<<<<< .mine
=======
当其他开发人员根据我的提交进行更新时，第三行和第四行将被添加到其他开发人员计算机中。我正在使用SVN。
这里添加了什么？
Here's an example:
private void btnUndo_Click(object sender, EventArgs e)
{
<<<<<<< .mine
=======
The third and fourth line are being added to other developers machines when they do an update with from my commit. I'm using SVN.
What is being added here?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（3）
您/某人在更新/提交方面存在冲突，并且您在签入之前没有解决该冲突。
<<<<<<和=====< /code> 是为了告诉你源代码的哪一部分有冲突，你需要在实际提交之前解决这些问题——提交甚至可能已经警告你，并且你可能已经向 SVN 确认它已解决。You/Somebody had a conflict on the update/commit and you didn't resolve it before checking in.
The
<<<<<and=====is there to show you what part of the source code is conflicting, and you need to resolve those before you actually commit -- the commit may even have warned you about it, and you may have confirmed to SVN that it was resolved.这就是说文件中与该行存在冲突，并且这是冲突的您的本地文件。附近可能有一个“他们的”部分（也许在上面？），代表存储库的代码与您的代码不一致。
That's saying that there is a conflict in the file with that line, and that this is your local file that is in conflict. There is likely a "theirs" portion nearby (above maybe?) that represents the repository's code that doesn't agree with yours.
另一个开发人员似乎正在提交处于冲突状态的文件。
svn commit不允许您提交未解决的冲突文件（您必须首先执行svnsolved）。也许一个更大的问题是他为什么/如何将此文件提交到存储库？
The other developer seems to be committing a file in conflict status.
svn commitdoesn't allow you to commit conflicted file that are not resolved (you have to do ansvn resolvedfirst).Perhaps a bigger question to ask is why/how he committed this file to the repository?