简体繁体 English

吉特：我该如何撤消导致冲突的樱桃挑剔-不提交？

[英]Git: How do I undo a cherry-pick --no-commit that generated conflicts?

原文 2019-02-02 02:05:04 8 1 git/ git-bash

I executed a git cherry-pick XXX --no-commit. 我执行了git cherry-pick XXX --no-commit。 I believe this just updates the staging area and the working directory and does not commit anything. 我相信这只会更新登台区域和工作目录，并且不会提交任何内容。 The problem is that after executing this command I got many conflicts. 问题是执行此命令后，我遇到许多冲突。 How do I undo this? 我该如何撤消呢？ I want to go back to the way it was before the command. 我想回到命令之前的样子。 I ran this on a patch branch. 我在补丁分支上运行它。 what command do I execute? 我执行什么命令？

1 个解决方案

git reset --hard HEAD will restore the state of last commit. git reset --hard HEAD将恢复上一次提交的状态。 (Then you'll be able to resume your cherry-picking process, or not, or in a different order.) （然后，您将可以继续或不继续，或者以其他顺序继续进行樱桃采摘过程。）

git merge --no-commit vs git cherry-pick --no-commit - git merge --no-commit vs git cherry-pick --no-commit

如何撤消成功的“git cherry-pick”？ - How to undo a successful "git cherry-pick"?

为什么`git cherry-pick`（没有`--no-commit`）不运行我的提交后挂钩？ - Why doesn't `git cherry-pick` (without `--no-commit`) run my post-commit hook?

如何使用他们的更改解决挑选挑战？ - How do I resolve cherry-pick conflicts using their changes?

Git Cherry-Pick和Conflicts - Git Cherry-Pick and Conflicts

“git cherry-pick”添加“Conflicts：”行来提交消息 - “git cherry-pick” adds “Conflicts:” line to commit message

我如何挑选来自github的未合并提交？ - How do I cherry-pick an unmerged commit from github?

git cherry-pick {commit-hash}做什么？ - what does git cherry-pick {commit-hash} do?

Git：如何在没有以前所有历史记录的情况下挑选提交 - Git: How to cherry-pick a commit without all previous history

如何git cherry-选择二进制文件提交 - How to git cherry-pick a commit with binary files

暂无

暂无

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

相关问题 git merge --no-commit vs git cherry-pick --no-commit - git merge --no-commit vs git cherry-pick --no-commit 如何撤消成功的“git cherry-pick”？ - How to undo a successful "git cherry-pick"? 为什么`git cherry-pick`（没有`--no-commit`）不运行我的提交后挂钩？ - Why doesn't `git cherry-pick` (without `--no-commit`) run my post-commit hook? 如何使用他们的更改解决挑选挑战？ - How do I resolve cherry-pick conflicts using their changes? Git Cherry-Pick和Conflicts - Git Cherry-Pick and Conflicts “git cherry-pick”添加“Conflicts：”行来提交消息 - “git cherry-pick” adds “Conflicts:” line to commit message 我如何挑选来自github的未合并提交？ - How do I cherry-pick an unmerged commit from github? git cherry-pick {commit-hash}做什么？ - what does git cherry-pick {commit-hash} do? Git：如何在没有以前所有历史记录的情况下挑选提交 - Git: How to cherry-pick a commit without all previous history 如何git cherry-选择二进制文件提交 - How to git cherry-pick a commit with binary files

相关标签

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