-
Type:
Bug
-
Resolution: Unresolved
-
Priority:
Low
-
None
-
Affects Version/s: 10.2.0, 10.2.1, 10.2.2, 10.2.3, 10.2.4
-
Component/s: Pull Request - Cascading Merge
-
None
-
Severity 3 - Minor
Issue Summary
Cascade merge pull requests that stop because of an active merge queue may have misleading description if there is a merge conflict.
Steps to Reproduce
- Create and merge a PR on a branch that has a cascade rule
- Ensure one of the target branches in the cascade has an active merge queue
- Ensure that same target branch will have a conflict with the change
Expected Results
A PR is opened that has an appropriate description.
Actual Results
The description opened says the PR will be added to the merge queue and cascade will continue. It won't because the conflict must first be manually resolved.
Workaround
Ignore the PR description and resolve the conflict manually.