Skip to content

DX-002: Add .changelog entry files to avoid merge conflicts #514

Description

@IbrahimIjai

Context

If every pull request edits the top of CHANGELOG.md, every concurrent pull
request conflicts on the same handful of lines. The fix is well-established:
each PR writes its own small file, and a release command merges them. See
docs/dx_1/002_changelog.md §3.

Scope

  • Create .changelog/unreleased/ with a README.md explaining the workflow and
    a TEMPLATE.md showing the frontmatter.
  • Define the entry schema: type (the six categories), area (enum: trade,
    pools, earn, referrals, faucet, wallet, docs, ci, internal), pr (number),
    breaking (boolean), plus a markdown body of one or two sentences.
  • Naming convention <pr-number>-<kebab-slug>.md, so two PRs can never collide.
  • Document in CONTRIBUTING.md and AGENTS.md when an entry is required — any
    user-visible change — and when it is not.
  • Add a worked example entry file that the validator (DX-003) will accept.

Acceptance criteria

  • .changelog/unreleased/ exists with README and template, both accurate.
  • The schema is written down in one place and referenced, not duplicated.
  • CONTRIBUTING.md and AGENTS.md state the requirement in their own voice.
  • Two entry files added on separate branches merge without conflict — show
    the demonstration in the PR description.

Out of scope

  • The validation script (DX-003) and the release command (DX-004).

Spec: docs/dx_1/002_changelog.md · Depends on: DX-001

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

Labels

GrantFox OSSIssue tracked in GrantFox OSSMaybe RewardedIssue may be eligible for a GrantFox rewardStellar WaveIssues in the Stellar wave programThird CampaignCampaign: Third CampaigndocumentationImprovements or additions to documentationenhancementNew feature or request

Type

No type

Projects

No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions