我试过:其结果是:error: Your local changes to theAbortingFirst, rewinding head to replay your work on top of it...that there is already a rebase-apply directory, and
I wonder if y
当我启动一个git rebase -i时,我可以发出像git rebase --continue或git rebase --abort这样的命令。这些命令仅在rebase正在进行时才起作用。(我非常感谢关于rebase内部工作原理的一些细节;git对一个repo做了什么,使它处于“正在进行的rebase”状态?)
ls `git rev-parse --git-dir` | grep rebase || echo no rebase我不能保证自己的本源。git rebase --continue什么也不做。我没有任何处于git状态的东西。我只是在等重基地。我能做什么?UDATE:这是: git rebase的输出--继续No changes - did you forget to use 'git add'
tag this new initial commitgit tag tmp
# godata->mono_channel[while_counter * const_frames_read + i] = bufferIn[i * data->audio_info_load->channelsdata->mono_channel[while_counter * const_frames_read<
file.patch>error: patch failed: <filename>:<line no>Patch failed at <commit msg>
The copy of the patch that failed is found in: .git/rebase-applyuseless