Pull Failed,Rebase Failed,stashing对IntelliJ没有帮助

时间:2018-03-18 10:54:36

标签: git intellij-idea rebase pull line-endings

当我试图从存储库中提取时,它说

        13:42   Git Pull Failed
        Your local changes would be overwritten by merge.
        Commit, stash or revert them to proceed. View them

当我试图改变时,它说

        13:47   Rebase Failed
        Cannot rebase: You have unstaged changes.
        Retry.
        Note that some local changes were stashed before rebase.

Stashing没有帮助(在藏匿完成后,情况相同)。

如果我打开更改列表,文件,差异报告,除了行分隔符之外,该内容是相同的。

如何摆脱这个死胡同?

0 个答案:

没有答案