diff --git a/.github/forks.yml b/.github/forks.yml index ef8fd53..d73b80f 100644 --- a/.github/forks.yml +++ b/.github/forks.yml @@ -128,6 +128,12 @@ forks: upstream_org: OCA upstream_track: "19.0" install_forward_port: false + # We carry ~30 not-yet-merged feature branches here and upstream moves + # fast (200+ commits in five weeks), so without this they silently rot. + # Conflicts are reported and never pushed, which is what we want: a + # conflict on an OpenUpgrade branch usually means upstream has since + # done that module, so it needs a per-module look, not an auto-rebase. + rebase_globs: ["19.0-mig-*", "19.0-fix-*"] - repo: ledoent/server-tools branches: ["18.0", "19.0", "20.0"]