I have been experiencing the following problem when updating a local repository with PULL operation in GIT .I work on local files.Then some team member which works from remote submits the updated version to the remote master.I pull it then, to update and merge with my local stuff.After this I usually get notifications about conflicts etc.I do add -A ,commit -a and when I look into local files ,only those that I worked on, I can see git database meta tags like HEAD >>>>>>>>>>> and commit number appear inline (php classes)and make the whole file corrupted .I thought it was something related to permissions (working on UBUNTU ).So I opened the whole permission to all files (chmod -R 777) .But still getting this issue.Once again ,it happens only with those local files which I modified.Being a noob with GIT and Linux would appreciate any helpful input on the subject.
Thanks.