git is injecting text in html

Asked Mar 26 '20 at 15:36

Active Mar 27 '20 at 04:26

Viewed 40 times

after i made a pull in my server i noticed that there is some weird text on my html .

some files on my server were changed so i had to merge the branch.

the text is showing in my Vue component in my home page.

i recompiled the code many time to check if it was the component but its not going off.

I don't understand where it came from ?

I tried to undo the commit.But it changed nothing .

any idea what's going on here?

edited Mar 27 '20 at 04:26

Utsav Patel

asked Mar 26 '20 at 15:36

DevStack101

2

It is a merge conflict. Have a look at this : https://stackoverflow.com/questions/161813/how-to-resolve-merge-conflicts-in-git – Utsav Patel Mar 26 '20 at 15:47
1

Someone (probably you) lied to Git that they resolved a merge conflict when they in fact did not. – Joseph Sible-Reinstate Monica Mar 26 '20 at 15:47
@UtsavPatel the problem was solved. it turns out there is a merge conflict like Joseph Sible-Reinstate Monica said . thanks – DevStack101 Mar 26 '20 at 16:17

0 Answers0