/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 vote224 views1 answer
How to check if its a character in r
TypeScript
0 vote208 views1 answer
Export data in Documents outside sandbox in swift
TypeScript
5 votes236 views2 answers
Copy array typescript
TypeScript
0 vote204 views1 answer
Tslint shows double quotes error prettier
TypeScript
0 vote203 views1 answer
Ignor sonar
TypeScript
1 vote204 views1 answer
Your image should have a src attribute that points to the kitten image. Your image element's alt attribute should not be empty.
TypeScript
0 vote207 views1 answer
What types of troop advancements were involved, and why were both needed in dday
TypeScript
3 votes199 views4 answers
How to run typescript file
TypeScript
-1 vote198 views1 answer
How to clear all the dropdown elements in jquery
TypeScript
0 vote212 views1 answer
Typeorm data array from relation
TypeScript