/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

2 votes161 views2 answers
Material dialog disable close
TypeScript
0 vote153 views1 answer
Benefits of waxing body hair
TypeScript
2 votes136 views1 answer
Adonis make model
TypeScript
4 votes142 views2 answers
Moment format timezone postgres
TypeScript
0 vote145 views2 answers
Benefits of matching in functional programming
TypeScript
0 vote136 views1 answer
From list of lists to dataframe
TypeScript
0 vote149 views1 answer
Number of elements in circular queue
TypeScript
1 vote166 views1 answer
Css fonts system
TypeScript
0 vote169 views1 answer
{"msg": "Attempting to decrypt but no vault secrets found"}
TypeScript
0 vote157 views1 answer
Mat-autocomplete options dropdown does not stick when scrolling
TypeScript