/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 vote209 views1 answer
Lodash mapvalues
TypeScript
2 votes205 views1 answer
Typescriprt specify type of key
TypeScript
0 vote287 views1 answer
Css all inoputs not checkbox
TypeScript
0 vote218 views1 answer
Regexp in typescript types
TypeScript
-1 vote207 views1 answer
Nestjs tutorial for beginners
TypeScript
9 votes293 views3 answers
Create next app typescript
TypeScript
7 votes198 views6 answers
How to Reload a Component in Angular
TypeScript
1 vote272 views1 answer
Duplicate names in sql
TypeScript
6 votes190 views3 answers
Property "'element'" does not exist on type 'htmlelement'.ts(2339)
TypeScript
0 vote223 views1 answer
Convert c# class to typescript
TypeScript