how to Resolving the Merge Conflict in my branch code example Example: show conflicts git git diff --name-only --diff-filter=U