“通过递归合并模式”旁边的这些符号是什么？在混帐合并？ [英] What are these symbols next to "merge mode by recursive" in git merge?

问题描述

当我使用 git pull [project name] master 来更新我的核心文件时，我在merge by recursive下得到了一堆绿色加号和红色减号。 这些符号是什么，它们是什么意思？

以下是截图：

感谢您的帮助。

解决方案

这是多少行已经改变的近似值。加号是用于新内容的，减号用于取出内容。修改以两者相等的数量结束。删除只是缺点，新文件都是加号。

希望这有助于您！

When I use git pull [project name] master to update my core files, I get a bunch of green plus and red minus signals under "merge made by recursive." What are these symbols and what do they mean?

Here's a screenshot:

Thank you for your help.

解决方案

That is an approximation of how many lines have changed. Pluses are for new content and minuses are for what was taken out. Modifications end up with equal amount of both. Deletions are only minuses and new files are all pluses.

Hope this helps!

这篇关于“通过递归合并模式”旁边的这些符号是什么？在混帐合并？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！