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.發版前主管花一小時解決合併衝突。