我git merge master --no-commit
在一个分支中运行 a ,给出的唯一输出是:
Auto-merging path/to/file
Automatic Merge went well; stopped before committing as requested
但是,git diff HEAD --name-status
显示大约有 15 个文件被修改(以“M”为前缀)和 3 个文件被添加(以“A”为前缀)。不是所有来自合并的修改文件都被视为“自动合并”吗?那么这个特定文件有什么特别之处,它会打印为“自动合并”而不是其他文件?
更多信息(这是在我提交合并之前):
$ git log --oneline --graph --decorate --all
* ae3f058 (master) synced code from another source.
| * 3bd4147 (HEAD, branchA) blah blah blah
| * f6513f6 random message
| * fcbe65e more messages from commit history
| * 6bc99e2 I like green eggs and ham
|/
| * 1824723 (branchB) This is some other, unrelated branch.
|/
* 5a98fac some stuff right before branching
* 40b05f1 initial commit.