resolving merge conflicts from local brach and origin master code example Example: git find merge conflicts git diff --name-only --diff-filter=U