Skip to content

NOW.md prepend format guarantees a conflict between any two concurrent PRs #2233

Description

@gHashTag

Measured cost on 2026-08-19 alone: three manual conflict resolutions on docs/NOW.md (PR #2216 twice against wave merges, PR #2230 once), each identical in shape — two prepended entries, resolution = keep both. The L1 requirement (every PR updates NOW.md) plus prepend-at-top makes the conflict structural: any two PRs in flight collide. Options for an owner decision: (a) directory of entry files docs/now/-.md + a generated NOW.md (no shared hunk, no conflict); (b) .gitattributes 'docs/NOW.md merge=union' — helps local merges but GitHub's web merge does not honor custom merge drivers, so it only halves the pain; (c) accept the tax as a forcing function for serialized landings. No change made — the mechanism is constitutional (L1). Refs #2229.

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions