Bring F3 up to its release branch, with both sides' store tests (part 8 of 14)
mesh/delivery superseded: a newer head of the same pull request
mesh/merge-gate head 2d7ae1af8ffc merged into trunk fcdecb436117 — fail: head 2d7ae1af8ffc does not merge cleanly into trunk fcdecb436117: in conflict cmd/…
mesh/repo-check head 2d7ae1af8ffc merged into trunk fcdecb436117 — fail: head 2d7ae1af8ffc does not merge cleanly into trunk fcdecb436117: in conflict cmd/…
mesh/delivery superseded: a newer head of the same pull request
mesh/merge-gate head 2d7ae1af8ffc merged into trunk fcdecb436117 — fail: head 2d7ae1af8ffc does not merge cleanly into trunk fcdecb436117: in conflict cmd/…
mesh/repo-check head 2d7ae1af8ffc merged into trunk fcdecb436117 — fail: head 2d7ae1af8ffc does not merge cleanly into trunk fcdecb436117: in conflict cmd/…
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1003,7 +1003,7 @@ func (r Resolution) compose(with Rendering, owner map[string]string,
|
||||
// **An operator's value, from the assignment** (novox/hq ADR 0112, ADR 0155): what a
|
||||
// definition may not carry because it is true of one installation only. Filled from
|
||||
// the same layers a mergeable file takes, and refused when no layer set it.
|
||||
if err := settingInto(copied, WithDefaults(m, with.Settings[m.Module]), m.Module); err != nil {
|
||||
if err := unsetInConfigWords(settingInto(copied, WithDefaults(m, with.Settings[m.Module]), m.Module), m); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
// **Placed before anything reads a path.** A pathless directory receives the path
|
||||
|
||||
Reference in New Issue
Block a user