Auto-rebase

[Jericho]

I need to investigate if I can ensure branches created for PRs can be kept updated.

This was suggested by @AdmiringWorm during this morning's @gep13 live Twitch session.

[AdmiringWorm]

While it would be awesome if the addin discoverer could auto-rebase pull requests, as I said on the stream I do believe that it would probably be out-of-scope for the addin discoverers purpose.

Auto-rebasing would probably be better to be implemented as a github action in the necessary repositories instead (if possible).

That is just my own personal opinion of course.

[Jericho]

I was also wondering what to do if there are conflicts? I highly doubt I would be able to automate conflict resolution.

[AdmiringWorm]

I would think to regenerate/recreate the yaml file from the latest sources (basically what you already do when initially creating the the pr), then do a force push to replace the existing commit on the PR.

I think that is the approach that dependabot uses (the only one I know of that support auto-rebase, or rather auto-recreate).

[Jericho]

that's a very good idea.

[AdmiringWorm]

I have my moments 😄

[gep13]

@AdmiringWorm I am watching with interest the addins that are being created here: https://github.com/repo-sync as I think they will be very useful.

[AdmiringWorm]

@gep13 the pull request repo there was exactly the one I was thinking about when I said

Auto-rebasing would probably be better to be implemented as a github action in the necessary repositories instead (if possible).

But couldn't remember what the action I had seen was called 😢.

The other two repos I didn't know about though.