merge conflict
英 /mɜːrdʒ ˈkɑːnflɪkt/
中文释义
合并冲突
A situation where changes from different sources clash and can't be combined automatically.
常用搭配
- resolve a merge conflict解决冲突
- hit a merge conflict遇到冲突
- messy merge conflict棘手冲突
例句
- We got a merge conflict because we edited the same file.我们改了同一文件，出现合并冲突。
- The lead spent an hour resolving the merge conflict before the release.发版前主管花一小时解决合并冲突。