/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

0 vote114 views1 answer
Wordpress get_posts custom posts by meta key
TypeScript
0 vote144 views1 answer
Typescript extend imported namespace
TypeScript
-1 vote146 views1 answer
What is http request made of
TypeScript
0 vote115 views1 answer
How to add enchantments to mobs plugin
TypeScript
0 vote123 views1 answer
Eslint airbnb react typescript
TypeScript
35 votes166 views6 answers
Add days to date javascript
TypeScript
2 votes131 views10 answers
Robux
TypeScript
0 vote110 views1 answer
Google sheets k format
TypeScript
0 vote115 views1 answer
Multiline comments coding
TypeScript
63 votes269 views6 answers
React router install
TypeScript