/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

2 votes226 views1 answer
State in react typescript
TypeScript
2 votes251 views1 answer
Adonis model preload with condition
TypeScript
1 vote234 views1 answer
Python retrieve name of sheets in workbook
TypeScript
0 vote223 views1 answer
DAX check if value exists in another table
TypeScript
0 vote215 views1 answer
Typescript webpack node
TypeScript
0 vote244 views1 answer
Components of loadrunner
TypeScript
1 vote246 views6 answers
Swift constraints programmatically
TypeScript
5 votes214 views1 answer
Cheats for dino game chrome
TypeScript
0 vote220 views1 answer
How to check that tuple A contains all elements of tuple B python?
TypeScript
3 votes232 views2 answers
Check if list of objects contains value c#
TypeScript