Skip to content

Update/merge docs - #511

Merged
jeffpaul merged 4 commits into
developfrom
update/merge-docs
May 6, 2026
Merged

jeffpaul merged 4 commits into
developfrom
update/merge-docs

Conversation

@jeffpaul

@jeffpaul jeffpaul commented May 5, 2026 •

Copy link
Copy Markdown
Member

What?

This PR updates the docs to call out how best to format squash merge commit titles to help with reviewing changes in develop as well as in building releases.

Copilot summary

This pull request updates project documentation to clarify development workflows and changelog conventions. The main changes include improvements to the changelog entry section in the pull request template, removal of the table of contents from the developer guide, and detailed guidance on squash merge strategies and commit titling.

Documentation and workflow improvements:

  • Expanded the changelog entry section in .github/PULL_REQUEST_TEMPLATE.md to clarify the categories for PR summaries, and renamed "Development Update" to "Developer" for consistency.
  • Removed the table of contents from docs/DEVELOPER_GUIDE.md to streamline the introduction and focus on the content.

Merge strategy and commit guidelines:

  • Added detailed instructions in docs/DEVELOPER_GUIDE.md on using squash merges, including disabling merge commits and rebase merging, and advice on curating commit messages for clarity.
  • Introduced a new section in docs/DEVELOPER_GUIDE.md explaining how to set squash merge commit titles to match the PR changelog entry, with examples and rationale for maintaining clear commit history and release notes.

Why?

How?

Use of AI Tools

Testing Instructions

Screenshots or screencast

Before After

Changelog Entry

Developer - Added squash commit merge title process docs.

Open WordPress Playground Preview

@jeffpaul jeffpaul added this to the 0.9.0 milestone May 5, 2026
@jeffpaul
jeffpaul requested review from dkotter and justlevine May 5, 2026 21:25
@jeffpaul jeffpaul moved this to Needs review in WordPress AI Roadmap May 5, 2026
@github-actions

github-actions Bot commented May 5, 2026 •

Copy link
Copy Markdown

The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the props-bot label.

If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message.

Co-authored-by: jeffpaul <jeffpaul@git.wordpress.org>
Co-authored-by: dkotter <dkotter@git.wordpress.org>

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

@codecov

codecov Bot commented May 5, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 69.17%. Comparing base (6afc763) to head (757bb10).

Additional details and impacted files
@@            Coverage Diff             @@
##             develop     #511   +/-   ##
==========================================
  Coverage      69.17%   69.17%           
  Complexity       981      981           
==========================================
  Files             63       63           
  Lines           4649     4649           
==========================================
  Hits            3216     3216           
  Misses          1433     1433           
Flag Coverage Δ
unit 69.17% <Ãļ> (Ãļ)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
ðŸ“Ē Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄ïļ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • ðŸ“Ķ JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Comment thread docs/DEVELOPER_GUIDE.md Outdated
dkotter
dkotter previously approved these changes May 5, 2026
Co-authored-by: Darin Kotter <darin.kotter@gmail.com>
@jeffpaul
jeffpaul merged commit 1f56cf8 into develop May 6, 2026
17 checks passed
@jeffpaul
jeffpaul deleted the update/merge-docs branch May 6, 2026 13:40
@github-project-automation github-project-automation Bot moved this from Needs review to Done in WordPress AI Roadmap May 6, 2026
Comment thread docs/DEVELOPER_GUIDE.md

An example of a squash merge from #359 can be seen in 4c9699f, while an example of the prior approach of a merge commit from #311 can be seen in e63d8c0.

### Squash Merge Commit Titles

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One thing I realized while working on another PR is often we have multiple changelog entries from a single PR (say we fixed on thing, changed one thing). Would we want all of those in the title? And if not, risk of losing those if we're just scanning commit history and not looking at the changelog entries on each PR

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bah, great point. That's a regular enough occurrence, that maybe we do one of:

  • revert to a reasonable PR title as the squash merge commit title
  • add other changelog entries at the top of the squash merge commit description
  • something else?

The "right" answer feels like option 1 and adding all changelog entries at the top of the commit description?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, my preference would be to have the commit title be a more generic overview of what the PR does (maybe even just leaving that to auto-populate the PR title). And then have the changelog entries in the description with props below that (and likely removing the individual commit messages that auto-populate there). But don't feel super strongly on that, defer to whatever makes the most sense on your end

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I'm happy with that, updated PR incoming...

simison pushed a commit to simison/ai that referenced this pull request May 25, 2026
* add section for setting squash merge commit titles with changelog entry

---------

Co-authored-by: dkotter <dkotter@git.wordpress.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants