Description
When a source branch is provided for a solution merge, it's possible to run into merge conflicts in the automatically created pull request (if merging into a solution using the pull request strategy).
Steps to reproduce
Steps to reproduce the behaviour:
Create a branch that is at least one solution merge commit behind the target branch
Create a solution merge and populate the source branch with the branch in the previous step
Approve the solution mereg
Observe a merge conflict with the solution.xml
Expected behaviour
Rather than extracting the solutions into the source branch, we should always be creating a fresh branch from master and extracting into that. We then squash the source branch into this branch.
Description When a source branch is provided for a solution merge, it's possible to run into merge conflicts in the automatically created pull request (if merging into a solution using the pull request strategy).
Steps to reproduce Steps to reproduce the behaviour:
Expected behaviour Rather than extracting the solutions into the source branch, we should always be creating a fresh branch from master and extracting into that. We then squash the source branch into this branch.