解决：
git reset --hard
免责声明！
本站转载的文章为个人学习借鉴使用，本站对版权不负任何法律责任。如果侵犯了您的隐私权益，请联系本站邮箱yoyou2525@163.com删除。
猜您在找
Please commit your changes or stash them before you merge
Git冲突：commit your changes or stash them before you can merge.
git提交代码提示：Please enter the commit message for your changes. Lines starting
Git Pull Failed ：Your local changes would be overwritten by merge. Commit, stash or revert them
Git Pull Failed ：Your local changes would be overwritten by merge. Commit, stash or revert them
Your local changes would be overwritten by merge. Commit, stash or revert them to proceed的解决方法
Git 冲突：Your local changes would be overwritten by merge. Commit, stash or revert them to proceed.
Cherry-pick Failed Error merging 。You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists). Please, commit your changes before you merge.
You have 1 unapplied migration(s). Your project may not work properly until you apply the migrations for app(s): shopadmin. Run 'python manage.py migrate' to apply them.
git commit 时出现：please enter the commit message for your changes