fix: handle cherry-pick edge cases after AI conflict resolution#1045

myakove merged 2 commits into

mainmyk-org/github-webhook-server:mainfrom

fix/issue-1043-1044-cherry-pick-ai-edge-casesmyk-org/github-webhook-server:fix/issue-1043-1044-cherry-pick-ai-edge-casesCopy head branch name to clipboard