Is there an equivalent of “git apply --reject” for git rebase?
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: I want to use git rebase to take a sequence of commits and apply them to a different root commit. For example, git rebase --onto root start finish to get the commits from start to finish based on root . When git cannot apply a commit cleanly, it updates the file to show conflicts like this (example from git manual): Here are lines that are either unchanged from the common ancestor, or cleanly resolved because only one side changed. <<<<<<< yours:sample.txt Conflict resolution is hard; let's go shopping. ======= Git makes conflict resolution