Git merge后检查是否还存在冲突

git diff --check

–check
Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by core.whitespace configuration. By default, trailing whitespaces (including lines that consist solely of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible with --exit-code.

Git merge后检查是否还存在冲突

原文：https://www.cnblogs.com/codehome/p/14745002.html