git pull冲突 overwritten aborting_我的邮箱[email protected]程序员宅基地_git pull 报aborting

From github.com:26huitailang/learn-sth-everyday
   7cf57b0..d9f7ae2  master     -> origin/master
Updating 7cf57b0..d9f7ae2
error: Your local changes to the following files would be overwritten by merge:
    liaoxuefeng/awesome-python-webapp/LICENSE
Please, commit your changes or stash them before you can merge.
Aborting
From github.com:26huitailang/learn-sth-e