/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 vote251 views1 answer
Typescript declaring null
TypeScript
0 vote270 views1 answer
Open rails secrets file
TypeScript
3 votes267 views2 answers
How ro execute typescript file
TypeScript
0 vote306 views2 answers
Parameter 'event' implicitly has an 'any' type.ts(7006)
TypeScript
0 vote266 views1 answer
Download objects under a prefix in golang
TypeScript
21 votes269 views2 answers
How to compare distance between 2 objects unity
TypeScript
1 vote305 views1 answer
Useappselector
TypeScript
0 vote258 views1 answer
Do not use "// @ts-ignore" comments because they suppress compilation errors
TypeScript
0 vote291 views1 answer
Input type file in html events angular
TypeScript
1 vote249 views1 answer
React-native loading bar
TypeScript