/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 vote355 views1 answer
Flutter rotate animation icon on press
TypeScript
3 votes334 views1 answer
Intersection between two sets python
TypeScript
6 votes306 views3 answers
Mongodb count based on array of ids
TypeScript
3 votes309 views1 answer
How to align contents of div in center
TypeScript
-3 votes402 views1 answer
Cool_beasts = {"octopuses":"tentacles", "dolphins":"fins", "rhinos":"horns"} for ___ in cool_beasts.items(): print("{} have {}".format(___))
TypeScript
0 vote358 views2 answers
How to remove one object in an array of objects in mongoose
TypeScript
2 votes326 views2 answers
Date format in typescript
TypeScript
7 votes417 views2 answers
Sort array of objects in react js
TypeScript
1 vote345 views1 answer
Google sheets return number of unique items
TypeScript
0 vote328 views1 answer
How to print list contents in java
TypeScript