Check out example codes for "show conflicts git". It will help you in understanding the concepts better.

Code Example 1

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

Learn ReactJs, React Native from akashmittal.com