ewingjm / development-hub

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

fix: solution merge PR timeouts and conflicts #66

Closed ewingjm closed 3 years ago

ewingjm commented 3 years ago

Purpose

Resolves #65, resolves #64. Solution merge PRs were being frequently created with merge conflicts and solution merges were occasionally getting stuck on a 'Merging' status due to solution export timeouts.

Approach

Fixes the merge script to use async solution exports and create fresh branches from master even when a source branch is provided.

TODOs