The following untracked working tree files would be overwritten by merge
The following untracked working tree files would be overwritten by merge
Updating 3682dc0..0426f81
error: The following untracked working tree files would be overwritten by merge:
app/lmcjlcms/view/public/table.html
Please move or remove them before you can merge.
解决办法:
git clean -d -fx
git pull