I am working with a collaborator and we are using a remote repo on Bitbucket.
The problem that I am facing is when I push a change to the remote repo. My collaborator is not able to pull in the changes.
When he does a git pull he keeps on getting the following error ..
error: The following untracked working tree files would be overwritten by merge: test.php Please move or remove them before you can merge. Aborting
But that's exactly what I want it to do; have new update files overwrite the old files.
Why do I need to move or remove the files in order for me to obtain the changes?