/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

22 votes236 views3 answers
Typescript remove an item from array
TypeScript
0 vote282 views1 answer
Keyboard events pygame
TypeScript
0 vote233 views1 answer
Adding import of app routing module
TypeScript
1 vote240 views1 answer
Ionic modalcontroller No component factory found for Did you add it to
TypeScript
19 votes247 views3 answers
Set default route angular
TypeScript
0 vote196 views1 answer
Weights [0.03333567, 0.07472567, 0.10954318, 0.13463336, 0.14776211, 0.14776211, 0.13463336, 0.10954318, 0.07472567, 0.03333567]
TypeScript
0 vote209 views1 answer
Online doctor appointments in pakistan
TypeScript
1 vote251 views1 answer
Increase size of mat dialog
TypeScript
0 vote258 views1 answer
+github graphql api get commits from repo
TypeScript
1 vote242 views2 answers
Hosts path
TypeScript