/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 vote329 views1 answer
Pdfunite all documents in a folder with alphabetical order
TypeScript
0 vote278 views1 answer
How to find uncommon elements in two lists in python
TypeScript
0 vote293 views1 answer
Pick<Pick<Pick<DetailedHTMLProps<HTMLAttributes<HTMLDivElement>, HTMLDivElement>
TypeScript
3 votes283 views2 answers
What is typescript
TypeScript
29 votes281 views4 answers
File ng.ps1 cannot be loaded because running scripts is disabled on this system.
TypeScript
1 vote310 views1 answer
How to add custom snippets in emmet in visual studio code
TypeScript
0 vote281 views1 answer
DecoDe query string to object javascript
TypeScript
14 votes283 views5 answers
Enum as type typescript
TypeScript
1 vote259 views1 answer
What does virtual assistants do?
TypeScript
14 votes285 views6 answers
Find the smallest number from an array
TypeScript