Does anyone have a solution for the scenario where upon promotion of a work item, rebasing fails and a PR/Change Request does not get created? Is there a way to force a rebase or creation of the PR?
i did not get a combine work items option, as none of the other open work items in this instance were touching related components. Promoting other work items first did not resolve the issue and as this was the stage immediately before production I did not want to deploy everything in the stage as not all work items were ready for deployment.
I was able to resolve by manually rebasing the work item branch via the CLI (resolving the merge conflicts), then re-adding the relevant metadata changes (again via the CLI). This seems to have triggered the PR creation and we were able to deploy, but does not seem like a sustainable workaround, especially for non-developers. It would be great if we could see what specifically is causing the issue in the case of a merge conflict so we can resolve it more easily.