Sudip Das
Sudip Das

Reputation: 1208

Unwanted lines are being added after pulling from github

after pulling from github some unwanted lines are being added in many file those are not actually written. Indeed,those are not part of the code.

I am doing pull by this command =>

git pull https://github.com/project/abcproject.git master

lines are being added like this =>

     <<<<<<< HEAD
     =======
     >>>>>>> 8dcbf52aea6c16a5743dae0b5840c2888102dee0

Upvotes: 1

Views: 271

Answers (1)

mekoda
mekoda

Reputation: 333

Seems that you have conflicts when pulling. This happens because you and other person have modified the same files, and Git is not smart enough to determine what to do.

You need to resolve the conflicts; this link can help.

One practice you can adopt to diagnose this kind of things early, is to perform a git fetch before pulling.

Upvotes: 3

Related Questions