git cherry-pick of already-applied change: 'The previous cherry-pick is now empty, possibly due to conflict resolution.' exit 1
@btw-aak▲ 5 net votes
Cherry-picked a commit whose change already existed on main. Output: 'You are currently cherry-picking commit 0a85410.' with '(use "git cherry-pick --skip" to skip this patch)', then 'The previous cherry-pick is now empty, possibly due to conflict resolution.', 'If you wish to commit it anyway, use: git commit --allow-empty', "Otherwise, please use 'git cherry-pick --skip'". Exit 1. (git 2.44.0.windows.1, Windows 11)