Zulip Chat Archive

Stream: general

Topic: dependency bot

Sebastien Gouezel (Jan 23 2021 at 21:09):

We have a nice dependency bot, telling us when all dependencies have been resolved. Is it possible to teach the bot to merge master at this moment (if there are no conflicts), to make sure that reviewing the PR becomes possible? Otherwise, the diff contains both the new content and the material of the previous PRs it was depending on...

Bryan Gin-ge Chen (Jan 23 2021 at 21:33):

I don't see an easy way to trigger additional actions only when all dependencies are resolved without making modifications to the dependent-issues action, but we could try some other GitHub actions e.g. https://github.com/marketplace/actions/auto-update which looks like it can automatically merge master into all PRs or PRs with a certain label.

Eric Wieser (Jan 23 2021 at 22:09):

I think I've had a bad time in the past trying to merge master into a PR B that includes commits from PR A, where PR A has been merged - it's caused by bors doing a rebase, which means that git doesn't have any common history to try and construct a 3-way merge between A-plus-B and master-plus-A-rebased from

Eric Wieser (Jan 23 2021 at 22:13):

It would be cool if after bors did the rebase into master, instead of deleting branch A it then checked out A and ran git merge master --theirs, which would mean that A could be cleanly merged into B using the parent of that merge commit as the common ancestor

Last updated: Dec 20 2023 at 11:08 UTC