git.exe pull --progress --no-rebase -v "origin"From http://git.code.oa.com/tencentvideo_project/webrebuild= [up to date] master -> origin/mastererror: The following untracked working tree files would be overwritten by merge:mac/v1/html/detail_all.htmlmac/v1/html/detail_cartoon.htmlmac/v1/html/detail_movie.htmlmac/v1/html/detail_tv.htmlmac/v1/html/detail_variety.htmlmac/v1/html/svg_icon.htmlmobile/live/html/about/privacy_policy.htmlmobile/live/html/about/question.htmlmobile/live/style/question.cssweb/v4/html/channel/channel_auto.htmlweb/v4/style/img/channel/rank_bg.pngweb/v4/style/img/channel/rank_bg.psdPlease move or remove them before you can merge.Aborting//怎么处理这个问题啊
- 1 回答
- 0 关注
- 2354 浏览
添加回答
举报
0/150
提交
取消