You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
In the case of conflicts while cherry-picking, one can pass in the --skip flag and it'll skip the problematic patch. However, this option is not suggested by completions nor is it suggested when running git status, unlike when we're rebasing.
Activity
[-]Teach cherry-pick the --skip option[/-][+]Emphasise the cherry-pick --skip option[/+]Denton-L commentedon Sep 18, 2019
Currently cooking here: https://github.com/gitster/git/commits/dl/complete-cherry-pick-revert-skip
Denton-L commentedon Sep 30, 2019
Merged here: gitster@21db12c
dscho commentedon Oct 1, 2019
Great!
FWIW you can close these gitgitgadget/git issues by adding a line
This fixes <URL>into the commit message. Worked for me in the past ;-)