/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 vote321 views1 answer
Write getter angular
TypeScript
26 votes290 views2 answers
List commits in git
TypeScript
10 votes322 views3 answers
Foreach typescript
TypeScript
0 vote313 views2 answers
Minikube arguments --cpus
TypeScript
14 votes298 views4 answers
Matplotlib subplots size
TypeScript
0 vote298 views1 answer
Dynamic key interface typescript
TypeScript
1 vote318 views1 answer
How to send data between components in react with redirect
TypeScript
0 vote280 views1 answer
Multiline comments coding
TypeScript
59 votes526 views6 answers
Sum elements in list python
TypeScript
0 vote284 views1 answer
Different types of errors in numerical methods
TypeScript