/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 vote414 views1 answer
Error NG8002: Can't bind to 'ngbCollapse' since it isn't a known property of 'ul'.
TypeScript
0 vote312 views1 answer
Mergensherts meaning
TypeScript
1 vote319 views1 answer
React router dom private route typescript
TypeScript
0 vote328 views1 answer
What do brackets mean in python
TypeScript
0 vote292 views1 answer
Angular elementref parent
TypeScript
0 vote316 views1 answer
How to disable form control but keep value
TypeScript
1 vote350 views1 answer
Powershell script remove directory recursive
TypeScript
13 votes322 views4 answers
Ionic generate resources
TypeScript
1 vote384 views2 answers
When i console log a obj its printing object
TypeScript
2 votes294 views1 answer
Styled-components error in typescript
TypeScript