/TypeScript/How to show code conflicts in git

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

-1

Source: atlassian.com

How to show code conflicts in git

$ git statusOn branch masterYou have unmerged paths.(fix conflicts and run "git commit")(use "git merge --abort" to abort the merge)Unmerged paths:(use "git add <file>..." to mark resolution)both modified:   merge.txt

-1

Source: atlassian.com

Similar codes

3 votes242 views3 answers
Angular email regular expression
TypeScript
0 vote258 views1 answer
How arrange order of boxplots matplotlib
TypeScript
0 vote253 views1 answer
Destructuring props in styled-components
TypeScript
0 vote227 views1 answer
What will be the result of the cp /etc/hosts . command?
TypeScript
1 vote236 views1 answer
React routes not working after build
TypeScript
0 vote232 views1 answer
Pretty print json file cmd
TypeScript
4 votes235 views2 answers
Events on checkbox in jquery
TypeScript
5 votes240 views2 answers
How to select array element via id and print it
TypeScript
0 vote279 views1 answer
Angular closest element
TypeScript
1 vote258 views1 answer
Execute only one test spec with angular-cli (ng test)
TypeScript