-
Notifications
You must be signed in to change notification settings - Fork 193
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
nethack, bump to 3.6.7 #3823
nethack, bump to 3.6.7 #3823
Conversation
❌
|
怎么fail了?我就是原样merge的啊,也能跑 |
你需要rebase一下 |
rebase之后,应该是只有这个commit: 35ef915 |
rebase不是合并两个branch吗?不懂怎么在这里rebase |
你的提交里现在有4个commit, 一个是merge, 一个是nethack, 还有两个是wps-office的。 大体步骤是在本地执行
这时候git会打开编辑器,你可以看到3个commit,
然后你将wps的两个comiit的pick改成drop就可以通过rebase去掉不需要的commit 然后再git push -f来更新你fork的远程仓库了 |
可是我rebase的时候只出来了一个noop... |
No description provided.