Why git add <<<<<<<

Question

I did

git add -A .

then

git commit -m "message"

and then

git push origin master

then it gaves some error and said "git pull.. etc"

i did

git pull origin master

it gaves error about "merge conflict"

and then i did

git push origin master

but now i check my files i see in some of my files there are some codes

codes

How can i correct my files. Should i remove that codes manually ? Or is there any automatic method ?

Thanks for all

You fix the merge conflicts :-) Then you add those files to the index again and then you commit — Fredrik Pihl, Jun 25 '14 at 06:27

score 2 · Answer 1 · answered Jun 25 '14 at 06:13

2

These are called the conflict markers. These are the parts which GIT couldnt merge automatically.

You can check Resolve a Merge and then commit your changes

answered Jun 25 '14 at 06:13

Rahul Tripathi

score 0 · Answer 2 · answered Jun 25 '14 at 06:18

0

After git pull, resolve conflict

then again commit changes and do git pull/push

answered Jun 25 '14 at 06:18

Vinit Prajapati

How can i resolve conflict ? – Muhammet Arslan Jun 25 '14 at 06:18
@MuhammetArslan:- Did you checked the link which I have added in my answer. That tells you the way how to resolve the conflict! – Rahul Tripathi Jun 25 '14 at 06:19
from your snapshot, put only part either from head or with your changes, if both are same, put any one, and also remove line start with >>>>, and you are done. – Vinit Prajapati Jun 25 '14 at 06:19
@user3414693 yeah i check and now reading it. but maybe Vinit know any other thing , right ? Thanks for all. I will try and write – Muhammet Arslan Jun 25 '14 at 06:21

2 Answers2