/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 vote143 views1 answer
Laravel middleware for apis
TypeScript
27 votes139 views4 answers
How to hide bullet points in css
TypeScript
0 vote146 views1 answer
Material ui tab link external
TypeScript
56 votes302 views6 answers
Cannot be loaded because running scripts is disabled on this system.
TypeScript
1 vote128 views1 answer
Typescript merge union type props
TypeScript
0 vote147 views1 answer
How to separate elements in list python
TypeScript
1 vote160 views1 answer
Adonisjs hooks
TypeScript
3 votes129 views1 answer
'mat-form-field' is not a known element:
TypeScript
1 vote131 views1 answer
Typescript create map
TypeScript
13 votes131 views3 answers
Typescript integer
TypeScript