我正在尝试为了压缩提交而进行改组,我发生冲突:
<username>:~/path/to/director$git rebase -i HEAD~6
error: could not apply 0111a7a... <commit message>
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
Could not apply 0111a7acsadd9a9d98a9003a560a390a50a22afa3af546f42101... <full commit message>
然后,我执行以下操作来查找冲突:
find . -name "*.py" -exec egrep ".*HEAD.*" {} \;
因为我知道我只改变了python文件,所以我使用了*.py
globbing。但是,没有结果显示出来!有没有办法找到问题究竟是什么?
git status
和git diff
都很干净。