how to read merge conflicts in git code example
Example: 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