silverstripe / gha-merge-up

GitHub Action to merge-up supported branches in a repository
BSD 3-Clause "New" or "Revised" License
0 stars 2 forks source link

NEW Create action #1

Closed emteknetnz closed 1 year ago

emteknetnz commented 1 year ago

Issue https://github.com/silverstripeltd/product-issues/issues/753

Example of it in action - https://github.com/emteknetnz/silverstripe-config/commits/2

Here's an example of it failing on merge-conflict - https://github.com/emteknetnz/silverstripe-config/actions/runs/5526914815/jobs/10082502001

Here's an example of it failing where there's a difference in composer.json - https://github.com/emteknetnz/silverstripe-config/actions/runs/5527199168/jobs/10082717263

emteknetnz commented 1 year ago

@GuySartorelli Have implemented peer review feedback

Have tested updated code - works - https://github.com/emteknetnz/silverstripe-config/commits/2

GuySartorelli commented 1 year ago

There are still two unresolved conversations that you haven't responded to - please respond.

emteknetnz commented 1 year ago

Replied