Description
If the source branch specified on your solution merge has conflicts with the target branch, the solution merge will be stuck on a status of 'Merging' indefinitely.
Steps to reproduce
Create a branch from the target branch
Update a line in a file on the target branch
Update the same line in the branch created from the target branch
Create a solution merge and provide the branch created in step 1 as the source branch
Approve the solution merge
Observe that the solution merge is stuck in a status of 'Merging' indefinitely
Expected behaviour
The fact that there are merge conflicts with the target branch should be fed back to the solution merge.
Additional context
This is an issue in the Merge-SolutionMerge.ps1 script.
Description If the source branch specified on your solution merge has conflicts with the target branch, the solution merge will be stuck on a status of 'Merging' indefinitely.
Steps to reproduce
Expected behaviour The fact that there are merge conflicts with the target branch should be fed back to the solution merge.
Additional context This is an issue in the Merge-SolutionMerge.ps1 script.