/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

1 vote197 views1 answer
Ionic 3 alert backdrop dismiss
TypeScript
1 vote186 views1 answer
Styled components conditional hover
TypeScript
37 votes199 views3 answers
Angular date pipe 24 hour format
TypeScript
0 vote205 views1 answer
Css animation for beginners
TypeScript
0 vote192 views1 answer
W to check whether an image is a broken image or not in typescript angular
TypeScript
1 vote207 views6 answers
Could not find a declaration file for module implicitly has an 'any' type.
TypeScript
0 vote195 views1 answer
How to add array of objects in swagger 2.0
TypeScript
0 vote175 views1 answer
Group elements in list with some attributes
TypeScript
1 vote200 views4 answers
Pokediggerprank244
TypeScript
1 vote196 views1 answer
React protected routes typescript
TypeScript