/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 vote114 views1 answer
Typescript array of empty objects
TypeScript
3 votes103 views1 answer
Label points in plot in r
TypeScript
0 vote97 views1 answer
Login page react native
TypeScript
2 votes104 views1 answer
Tweepy stream tweets from user
TypeScript
1 vote102 views1 answer
Cannot find module jquery typescript ionic
TypeScript
0 vote106 views1 answer
Cannot read property 'bypassSecurityTrustResourceUrl'
TypeScript
0 vote136 views1 answer
Typeorm where in example
TypeScript
1 vote106 views1 answer
Advantages of automation
TypeScript
1 vote107 views1 answer
Nuxt "AxiosRequestConfig"
TypeScript
1 vote129 views1 answer
Type script edeode url
TypeScript