CODEWITHSUNDEEP
gitgit-pullheadmerge-conflict-resolution
RGkevin
RGkevin

Reputation: 21

Why does Git returns these characters when I pull from my remote repository?

<<<<<<< HEAD
    </div>
    <?php if( is_front_page() ){ ?>
        <div class="slogan-container">
            <div class="slogan-img"></div>
        </div>
    <?php }?>
=======
    </div>
>>>>>>> 026a843d

So my question is, why does this text appear when I pull data from my remote repo? I'm new on Git, hope someone can help me.

Upvotes: 2

Views: 85

Answers (2)

Michael Durrant
Michael Durrant

Reputation: 96484

Merge Conflicts.

You have a discrepancy in file(s) on the same line(s) of code between your local version(s) and the version(s) on the server, usually indicating that two people have edited the same file on the same line(s), or that one person has pushed changes from a different location, then made changes locally somewhere else and tried to pull the other changes in from the remote.

It's likely you did a git pull to get to this point. Either that or the safer route of a git fetch first (which would be safer) and then a git merge (which would also lead to this conflict).

When changes to the same file are done in different area git actually does an amazing job of merging the changes together. However when the changes are on the same lines or blocks, then you are left with the merge conflict and both sets of code. It's up to you to figure out the lines you want, remove the others, remove the >>>>>>, ======= and <<<<<< signs and then git merge --continue.

The significant of the symbols is that code between <<<<<<<<< and ======== is what was in your development copy, whereas the code between the ======== and the >>>>>>>>>>> is the code from the remote.

I've answered more info on the general git process that may help at https://stackoverflow.com/a/9204499/631619

Upvotes: 4

Michael Krelin - hacker
Michael Krelin - hacker

Reputation: 143081

You have conflict. Different changes have been applied to your HEAD and remote branch. You should edit things to your liking and commit.

Upvotes: 3

Related Questions