/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 vote248 views1 answer
Two lists into one list of tules
TypeScript
0 vote239 views1 answer
Mongodb nest.js
TypeScript
6 votes255 views2 answers
How to print 4 digits after decimal in c++
TypeScript
0 vote260 views1 answer
Firebase not found in envirorment.ts file angular
TypeScript
1 vote238 views1 answer
How to delete objects in lua
TypeScript
4 votes299 views1 answer
Typescript sleep
TypeScript
0 vote253 views1 answer
R merge lists override
TypeScript
7 votes291 views3 answers
C# System.InvalidOperationException: 'session not created: This version of ChromeDriver only supports Chrome version 85 (SessionNotCreated)'
TypeScript
1 vote241 views1 answer
Geting request header in loopback4
TypeScript
0 vote234 views1 answer
How to erase elemts accoding to index c++
TypeScript