If there are any issues related to the cherry-pick then ream members must highlight merge or cherry-pick risks during refinement or early in the sprint.
Maintain a centralized troubleshooting guide.
Capture all requirement changes in writing (JIRA/Confluence). Obtain documented design approval before starting development.
