how to get merge conflicts in git code example
Example 1: show conflicts git
git diff --name-only --diff-filter=U
Example 2: how to show code conflicts in git
$ cat merge.txt<<<<<<< HEADthis is some content to mess withcontent to append=======totally different content to merge later>>>>>>> new_branch_to_merge_later