Description
When selecting multiple commits, right clicking, selecting "Cherry Pick" and confirming, there is an error.
In my case (I selected three commits of another branch that I wanted to cherry-pick into the development branch), the full error is:
git -c diff.mnemonicprefix=false -c core.quotepath=false cherry-pick 5c128c87d85cd19e6eac84d584e92a39eac43acc 7d0c0c68d0a0b7ce37d67e84b1742201c141a00c fc8f400b997ed12d37d0ec06f08028a20ddd71ae
error: a cherry-pick or revert is already in progress
hint: try "git cherry-pick (--continue | --quit | --abort)"
fatal: cherry-pick failed
Completed with errors, see above
Attachments
Issue Links
- is caused by
-
SRCTREE-1487 In-progress cherry-picking detection + stop cherry-picking from current branch
- Needs Triage