简体   繁体   English

使用git rebase --edit-todo修复脚本后该怎么办?

[英]What to do after fixing the script with git rebase --edit-todo?

I ran git rebase -i mytag and, based on git's reference , used the keyword drop instead of removing a line. 我运行了git rebase -i mytag并根据git的引用 ,使用了关键字drop而不是删除一行。 It seems like my version (2.5.4) doesn't support it, so I got this error: 好像我的版本(2.5.4)不支持它,所以我收到了这个错误:

Unknown command: drop aaabbbbccccddddd Update README.md 
Please fix this using 'git rebase --edit-todo'.

After running the recommended command, I removed the lines where I added a drop , saved and quit the editor. 运行推荐的命令后,我删除了添加了一个drop ,保存并退出编辑器。 I was hoping git would continue the previous rebase process or let me know what to do next. 我希望git会继续之前的rebase过程,或者让我知道下一步该怎么做。 Instead, no message is shown on my CLI. 相反,我的CLI上没有显示任何消息。

要继续之前的rebase进程,只需运行git rebase --continue

声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.

 
粤ICP备18138465号  © 2020-2024 STACKOOM.COM