Search
 
SCRIPT & CODE EXAMPLE
 
CODE EXAMPLE FOR TYPESCRIPT

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
Source by www.atlassian.com #
 
PREVIOUS NEXT
Tagged: #show #code #conflicts #git
ADD COMMENT
Topic
Name
5+8 =