Phillip Wood <phillip.wood123@xxxxxxxxx> 于2021年8月1日周日 下午6:14写道： > > > This is the improved advice: > > > > hint: Resolve all conflicts manually, mark them as resolved with > > hint: "git add/rm <conflicted_files>", then run "git cherry-pick \ > > --continue". > > hint: You can instead skip this commit: run "git cherry-pick --skip". > > hint: To abort and get back to the state before "git cherry-pick", > > hint: run "git cherry-pick --abort". > > This new wording matches what we have for rebase which is good, I am > slightly worried that the lines end up being quite long though they are > just under 80 characters. It might be worth splitting the line that > mentions running "git cherry-pick --continue" so it is a bit shorter. > Agree. > Best Wishes > > Phillip > Thanks. -- ZheNing Hu
