当我运行git status命令时,会出现以下错误信息:
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 2 different commits each, respectively.
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# .gitignore
nothing added to commit but untracked files present (use "git add" to track)
所以我不能拉或推。当我拉的时候会出现这种情况:
macoss-MacBook-Pro-10:Marketing owner12$ git pull origin master
Password for 'https://genadinik@bitbucket.org':
From https://bitbucket.org/genadinik/marketing
* branch master -> FETCH_HEAD
error: The following untracked working tree files would be overwritten by merge:
.DS_Store
Please move or remove them before you can merge.
Aborting
我该怎么做才能解决这个问题? 谢谢!