Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I am trying to merge in git and get the following error:
"error: The following untracked working tree files would be overwritten by merge:
app/.DS_Store
Please move or remove them before you can merge.
Aborting"
Any help would be appreciated.
It looks like that’s a special OS X file to do fancy things when displaying the folder.
I think you just need to edit your .gitignore file (in the root directory of your application) to include that file and then try again.
EDIT: You may also have to use git rm app/.DS_Store if it’s already tracking the file (I think I’ve had to do that in the past with this sort of problem).