Skip to content

Avoid expanding environment-only conflict markers - #2149

Draft
zaniebot wants to merge 5 commits into
zb/resolve-activated-extras-in-bddfrom
zb/restrict-conflict-world
Draft

zaniebot wants to merge 5 commits into
zb/resolve-activated-extras-in-bddfrom
zb/restrict-conflict-world

Commits

  1. Commits on Sep 29, 2026

  2. Commits on Oct 7, 2026

  3. Commits on Oct 8, 2026