/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 vote144 views1 answer
Typescript date before
TypeScript
2 votes117 views2 answers
How to find a combination of all elements in a python list
TypeScript
0 vote120 views1 answer
Current and measurement physics formula
TypeScript
0 vote117 views1 answer
My bootstrap alerts code is not closing
TypeScript
0 vote123 views1 answer
Ngx-file-drop allow only image or pdf
TypeScript
4 votes102 views1 answer
Firestore decrement
TypeScript
0 vote119 views1 answer
Indexable type in ts
TypeScript
1 vote119 views1 answer
Typescript filter undefined
TypeScript
2 votes128 views1 answer
TypeScript: Restart server
TypeScript
0 vote124 views1 answer
Elements with the button role must be focusable
TypeScript