/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 vote133 views1 answer
How many sets of 3 in 4
TypeScript
0 vote130 views1 answer
R merge lists
TypeScript
-1 vote155 views1 answer
What are the components of http request
TypeScript
8 votes120 views3 answers
L'exécution de scripts est désactivée sur ce système.
TypeScript
0 vote123 views1 answer
Typescript import rename
TypeScript
0 vote138 views2 answers
How to check listening ports on a server
TypeScript
3 votes142 views1 answer
Typescript enumerate array
TypeScript
32 votes128 views1 answer
Policies for setting virtual environment -python
TypeScript
1 vote138 views1 answer
Mat datepicker pt-br
TypeScript
49 votes168 views5 answers
How to remove bullets from ul
TypeScript