Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add automation which warns PR authors when changes to upstream release branches will cause merge conflicts #852

Open
RikkiGibson opened this issue Nov 13, 2020 · 0 comments

Comments

@RikkiGibson
Copy link
Contributor

Scenario:

  • User opens a PR to release/dev16.8
  • A bot attempts to merge those changes to master behind the scenes (possibly to further downstream branches, but it seems harder to reason about the cause and effect in that case)
  • If there are conflicts in the merge, the bot leaves a comment with the conflict patch in there somehow to give the author a heads up that there will be conflicts in downstream releases after merging.

Alternatively, we may wish to reconsider the strategy of automatically flowing changes to downstream releases (as opposed to flowing to -vs-deps branches), in order to put the onus of making those changes work in other releases onto the IC and not onto our automated systems. This is what dotnet/runtime does, for example, and they have a handy "backport this to upstream release" automation that they can run on downstream PRs. e.g. dotnet/runtime#44477

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant