/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

-1 vote106 views2 answers
Whats a 3rd wheel
TypeScript
1 vote99 views1 answer
Macos fonts download for linux ubuntu
TypeScript
1 vote101 views1 answer
Sequelize is not null
TypeScript
0 vote106 views1 answer
Compy mongodb database with indexes
TypeScript
0 vote106 views1 answer
Comments html.erb
TypeScript
0 vote123 views1 answer
Typescript window ethereum
TypeScript
1 vote116 views3 answers
How to make all elements in array int python
TypeScript
0 vote110 views1 answer
If exits python sql
TypeScript
0 vote158 views2 answers
Flutter too many positional arguments 0 expected but 1 found
TypeScript
87 votes180 views6 answers
Typescript random number
TypeScript