[英]How do I undo a git reword that's already been pushed to origin?
I did a squash and accidentally reworded someone else's commit, which took place before I made my fork. 我做了一个壁球,不小心改写了别人的承诺,那是在我制造叉子之前发生的。 Now as a result my pull request shows a merge conflict and as 1 commit behind.
现在,结果是我的拉取请求显示了合并冲突,并在后面提交了1次。 I want to undo the reword done to that commit, but I dont know how to do that.
我想撤消对该提交所做的更改,但是我不知道该怎么做。 Here's the pull request: https://github.com/satnogs/satnogs-client-ansible/pull/1
这是请求请求: https : //github.com/satnogs/satnogs-client-ansible/pull/1
You can update your upstream
and rebase
your work: 您可以更新您的
upstream
和rebase
你的工作:
git rebase upstream/<branch>
(considering your are on your working branch). git rebase upstream/<branch>
(考虑到您在工作分支中)。 It will reapply all your commits on top of new upstream/<branch>
. 它将在新的
upstream/<branch>
之上重新应用所有提交。
Then do force push
to your origin
. 然后用
push
到你的origin
。
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.