/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

6 votes167 views2 answers
TYPESCript props class component
TypeScript
-1 vote174 views2 answers
Cannot find name 'HttpHeaders'
TypeScript
1 vote174 views1 answer
Woocommerce sql query pulls products from category
TypeScript
0 vote219 views1 answer
Check anagramm in typescript
TypeScript
1 vote217 views2 answers
How to remove last 2 elements from list in python
TypeScript
0 vote175 views1 answer
Reports for market research
TypeScript
0 vote167 views1 answer
How to compra vales on lists python
TypeScript
0 vote177 views2 answers
How to check if a string contains only alphabets and space in java
TypeScript
2 votes196 views2 answers
Constraints in sql
TypeScript
0 vote165 views1 answer
Python requests exceptions
TypeScript