/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 votes258 views1 answer
Where do scientists get their stem cells for research?
TypeScript
1 vote239 views1 answer
How do i set limits in inputs in python
TypeScript
0 vote247 views1 answer
View and navigate your assignments (teacher) code for asp.net
TypeScript
0 vote257 views1 answer
How to do Email validation using Regular expression in Typescript
TypeScript
0 vote270 views1 answer
Cannot find module '@angular/cdk/a11y'
TypeScript
2 votes200 views1 answer
Visual Studio Code Typescript region folding
TypeScript
0 vote273 views1 answer
How to set references in sequelize type config/options
TypeScript
0 vote258 views1 answer
How to print selected elements from a list
TypeScript
1 vote263 views1 answer
Get frequency cpu arch
TypeScript
5 votes314 views3 answers
Jquery id that starts with
TypeScript