git revert 报错

git revert报错

jiulongwen@ubuntu:/home/POWERSTAR/jiulongwen/k3s_t2/dehoo_dual/mboot$ git revert d13aae97ea2d5241d5fe3acf40857cf20c37e621
error: The following untracked working tree files would be overwritten by merge:
        sboot/app_append.py
        sboot/secure/signer_generic_k3_generic/cas.pyc
        sboot/secure/signer_generic_k3_generic/generic_k1.pyc
        sboot/secure/signer_generic_k3_generic/pyasn1/__init__.pyc
        sboot/secure/signer_generic_k3_generic/pyasn1/codec/__init__.pyc
        sboot/secure/signer_generic_k3_generic/pyasn1/codec/ber/__init__.pyc
        sboot/secure/signer_generic_k3_generic/pyasn1/codec/ber/decoder.pyc
        sboot/secure/signer_generic_k3_generic/pyasn1/codec/ber/eoo.pyc
        sboot/secure/signer_generic_k3_generic/pyasn1/codec/cer/__init__.pyc
        sboot/secure/signer_generic_k3_generic/pyasn1/codec/cer/decoder.pyc
        sboot/secure/signer_generic_k3_generic/pyasn1/codec/der/__init__.pyc
        sboot/secure/signer_generic_k3_generic/pyasn1/codec/der/decoder.pyc
        sboot/secure/signer_generic_k3_generic/pyasn1/error.pyc
        sboot/secure/signer_generic_k3_generic/pyasn1/type/__init__.pyc
        sboot/secure/signer_generic_k3_generic/pyasn1/type/base.pyc
        sboot/secure/signer_generic_k3_generic/pyasn1/type/char.pyc
        sboot/secure/signer_generic_k3_generic/pyasn1/type/constraint.pyc
        sboot/secure/signer_generic_k3_generic/pyasn1/type/error.pyc
        sboot/secure/signer_generic_k3_generic/pyasn1/type/namedtype.pyc
        sboot/secure/signer_generic_k3_generic/pyasn1/type/namedval.pyc
        sboot/secure/signer_generic_k3_generic/pyasn1/type/tag.pyc
        sboot/secure/signer_generic_k3_generic/pyasn1/type/univ.pyc
        sboot/secure/signer_generic_k3_generic/pyasn1/type/useful.pyc
        sboot/secure/signer_generic_k3_generic/utils.pyc
        sboot/secure/signer_generic_k3_generic/version.pyc
        sboot/util/align
        sboot/util/mscompress
        sboot/version.inc
        u-boot-2011.06/mkconfig
        u-boot-2011.06/tools/scripts/make-asm-offsets
        u-boot-2011.06/tools/setlocalversion
Please move or remove them before you can merge.
Aborting

解决：

1、 git reflog 

jiulongwen@ubuntu:/home/POWERSTAR/jiulongwen/k3s_t2/dehoo_dual/mboot$ git reflog
59600d9 HEAD@{0}: reset: moving to HEAD^
d13aae9 HEAD@{1}: commit: add .gitignore and first compile
59600d9 HEAD@{2}: clone: from git@192.168.4.18:mStar/OTT-dual/K3S/mboot

查找到之前的版本

2、git reset 要revert掉的版本

jiulongwen@ubuntu:/home/POWERSTAR/jiulongwen/k3s_t2/dehoo_dual/mboot$ git reset --hard HEAD@{1}
HEAD is now at d13aae9 add .gitignore and first compile

3、git revert 刚开始的第一个提交

jiulongwen@ubuntu:/home/POWERSTAR/jiulongwen/k3s_t2/dehoo_dual/mboot$ git revert d13aae97ea2d5241d5fe3acf40857cf20c37e621