V2EX = way to explore
V2EX 是一个关于分享和探索的地方
Sign Up Now
For Existing Member Sign In
• 请不要在回答技术问题时复制粘贴 AI 生成的内容
This topic created in 4034 days ago, the information mentioned may be changed or developed.
test/scripts/util/file2.js: needs update
test/scripts/util/html_tag.js: needs update
test/scripts/util/index.js: needs update
You must edit all merge conflicts and then
mark them as resolved using git add
有哪些文件是冲突的呢？如何显示所有冲突文件呢？
输出显示很多文件需要升级，但是rebase怎么没有升级这些文件？
打开这些文件，也没看到有冲突发生啊？
 |
1
Catstyle Apr 24, 2015
既然打开文件没有冲突，先试试git status看看是不是已经修好了，然后根据提示最后来一发git add？
|
Select Language