git 错误128

Question

git.exe pull --progress --no-rebase -v "origin"

From http://git.code.oa.com/tencentvideo_project/webrebuild
= [up to date]      master     -> origin/master
error: The following untracked working tree files would be overwritten by merge:
mac/v1/html/detail_all.html
mac/v1/html/detail_cartoon.html
mac/v1/html/detail_movie.html
mac/v1/html/detail_tv.html
mac/v1/html/detail_variety.html
mac/v1/html/svg_icon.html
mobile/live/html/about/privacy_policy.html
mobile/live/html/about/question.html
mobile/live/style/question.css
web/v4/html/channel/channel_auto.html
web/v4/style/img/channel/rank_bg.png
web/v4/style/img/channel/rank_bg.psd
Please move or remove them before you can merge.
Aborting

//怎么处理这个问题啊

Answer 1

百度一下你就知道啊