how i know still have conflict with git code example

Example: show conflcited files

git diff --name-only --diff-filter=U