/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 vote201 views1 answer
Testing in different environments
TypeScript
0 vote189 views1 answer
Convert object to list of objects c#
TypeScript
0 vote209 views1 answer
C++ count frequency of elements vector
TypeScript
18 votes189 views3 answers
Enum to number typescript
TypeScript
0 vote233 views1 answer
Loop trhough list of lists in python and find single elements
TypeScript
0 vote197 views1 answer
?In static pages, the contents are fluid and changeable (e.g., rotating banners).
TypeScript
2 votes227 views1 answer
Check typescript version
TypeScript
0 vote199 views1 answer
How to delete a message by its id
TypeScript
1 vote218 views1 answer
Typescript style type
TypeScript
0 vote196 views1 answer
Echarts is not defined
TypeScript