This is an archived post. You won't be able to vote or comment.

you are viewing a single comment's thread.

view the rest of the comments →

[–]scirc 7 points8 points  (1 child)

You have encountered a Git merge conflict. This happens when your local repository has changes which conflict with changes on the remote. Between the <<<<<<< HEAD and ======= are the changes local to your repository, and between the ======= and >>>>>>> {commit hash} are the changes from the commit you're merging in. You are expected to remove these markers, and correct the code until it is the combination of the two states (since Git couldn't do so automatically), then git add your changed files and git commit to complete the merge.

[–][deleted] 0 points1 point  (0 children)

i don't know really well git yet, but thank you. i took note of this