Skip to content

doc: commit_convention: overhaul and formalize unspoken rules#1717

Merged
0xda157 merged 1 commit intonix-community:masterfrom
trueNAHO:doc-commit-convention-overhaul-and-formalize-unspoken-rules
Jul 28, 2025
Merged

doc: commit_convention: overhaul and formalize unspoken rules#1717
0xda157 merged 1 commit intonix-community:masterfrom
trueNAHO:doc-commit-convention-overhaul-and-formalize-unspoken-rules

Conversation

@trueNAHO
Copy link
Copy Markdown
Member

@trueNAHO trueNAHO commented Jul 17, 2025

This PR is a superset of #1622.

This PR is best viewed in rendered form:

nix run github:trueNAHO/stylix/doc-commit-convention-overhaul-and-formalize-unspoken-rules#doc

CC: @awwpotato @danth

Things done

Notify maintainers

@trueNAHO trueNAHO requested review from 0xda157 and danth July 17, 2025 17:19
@trueNAHO trueNAHO added topic: documentation Documentation additions or improvements kind: chore Project maintenance backport: release-25.05 labels Jul 17, 2025
Comment thread doc/src/commit_convention.md Outdated
Comment thread doc/src/commit_convention.md Outdated
Comment thread doc/src/commit_convention.md Outdated
Comment thread doc/src/commit_convention.md Outdated
@trueNAHO trueNAHO force-pushed the doc-commit-convention-overhaul-and-formalize-unspoken-rules branch from dfe3d9a to 9a3953f Compare July 24, 2025 19:32
@trueNAHO trueNAHO requested a review from 0xda157 July 24, 2025 19:32
@trueNAHO trueNAHO marked this pull request as ready for review July 24, 2025 19:32
Comment thread doc/src/commit_convention.md Outdated
@trueNAHO trueNAHO force-pushed the doc-commit-convention-overhaul-and-formalize-unspoken-rules branch from 9a3953f to 094767e Compare July 25, 2025 15:22
Copy link
Copy Markdown
Contributor

@0xda157 0xda157 left a comment

Choose a reason for hiding this comment

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

LGTM, ideally @danth would review this but we can merge if he doesn't have time in the next few days

@0xda157 0xda157 merged commit 57d036d into nix-community:master Jul 28, 2025
5 checks passed
stylix-automation bot pushed a commit that referenced this pull request Jul 28, 2025
Link: #1717

Reviewed-by: awwpotato <awwpotato@voidq.com>
(cherry picked from commit 57d036d)
@stylix-automation
Copy link
Copy Markdown
Contributor

Successfully created backport PR for release-25.05:

0xda157 pushed a commit that referenced this pull request Jul 28, 2025
Link: #1717

Reviewed-by: awwpotato <awwpotato@voidq.com>
(cherry picked from commit 57d036d)
trueNAHO added a commit to trueNAHO/stylix that referenced this pull request Aug 26, 2025
Fixes: 57d036d ("doc: commit_convention: overhaul and formalize unspoken rules (nix-community#1717)")
stylix-automation bot pushed a commit that referenced this pull request Sep 4, 2025
Fixes: 57d036d ("doc: commit_convention: overhaul and formalize unspoken rules (#1717)")
(cherry picked from commit ee12889)
Comment on lines +86 to +88
Automated backport PRs should be rebase-merged to retain the original commit
author and leverage the automatically appended `(cherry picked from commit
«COMMIT_HASH»)` line.
Copy link
Copy Markdown
Contributor

@0xda157 0xda157 Sep 4, 2025

Choose a reason for hiding this comment

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

not sure if this always the best option, currently prs that are merged using a merge commit lose that merge commit on the stable branch which feels somewhat undesirable.

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.

not sure if this always the best option, currently prs that are merged using a merge commit lose that merge commit on the stable branch which feels somewhat undesirable.

Yes, this has also been bothering me. However, the current Backport action does not retain this information in the generated PR. Feel free to open an issue or submit a PR.

0xda157 pushed a commit that referenced this pull request Sep 4, 2025
Fixes: 57d036d ("doc: commit_convention: overhaul and formalize unspoken rules (#1717)")
(cherry picked from commit ee12889)
make-42 pushed a commit to make-42/stylix that referenced this pull request Sep 13, 2025
MrSom3body pushed a commit to MrSom3body-contrib/stylix that referenced this pull request Sep 18, 2025
Fixes: 57d036d ("doc: commit_convention: overhaul and formalize unspoken rules (nix-community#1717)")
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind: chore Project maintenance topic: documentation Documentation additions or improvements

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants