/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 vote278 views1 answer
Electronjs remove menubar
TypeScript
7 votes277 views2 answers
Pandas read csv check if column exists
TypeScript
0 vote298 views1 answer
How to check if object is undefined in typescript
TypeScript
0 vote300 views1 answer
Create dict of value to index from list python
TypeScript
13 votes313 views4 answers
Tsc.ps1 cannot be loaded because running scripts is disabled on this system
TypeScript
-1 vote306 views1 answer
Java list of objects example
TypeScript
0 vote292 views1 answer
Whats a typedef in c++
TypeScript
3 votes272 views1 answer
Results of 1812
TypeScript
0 vote309 views1 answer
How-do-i-navigate-to-a-parent-route-from-a-child-route
TypeScript
0 vote288 views1 answer
How to display dotted line betweens 2 series point in high charts react native
TypeScript