search

ewingjm / development-hub

A continuous integration solution for Power Apps.
MIT License
35 stars 8 forks source link

Pull requests created with merge conflicts when source branch is provided #64

Closed ewingjm closed 3 years ago

ewingjm commented 3 years ago

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:

  1. Create a branch that is at least one solution merge commit behind the target branch
  2. Create a solution merge and populate the source branch with the branch in the previous step
  3. Approve the solution mereg
  4. 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.