Document merge style as a per-repo Forgejo setting #29

Merged

geusebio merged 1 commit from docs/default-merge-type-is-merge into main

2026-08-18 17:15:26 +00:00

geusebio commented

2026-08-18 17:14:16 +00:00

Owner

Someones.Computer's default merge style was changed to merge (plain merge commits) for a cleaner git history viewer, rather than the squash default used elsewhere. VCS.md's Merge style section, [skip ci] note, and WIP-prefix check all assumed squash unconditionally; this updates them to say it's a per-repo Forgejo setting and calls out the Someones.Computer override.

Someones.Computer's default merge style was changed to `merge` (plain merge commits) for a cleaner git history viewer, rather than the squash default used elsewhere. VCS.md's Merge style section, [skip ci] note, and WIP-prefix check all assumed squash unconditionally; this updates them to say it's a per-repo Forgejo setting and calls out the Someones.Computer override.

geusebio added 1 commit

2026-08-18 17:14:16 +00:00

Note that merge style is a per-repo Forgejo setting, not a hard rule 4770255878

Someones.Computer overrides the squash-merge default to plain merge
commits for a cleaner git history viewer. Document the override and
what it changes for [skip ci] and the WIP-prefix check.

geusebio merged commit 4e957798f6 into main

2026-08-18 17:15:26 +00:00

geusebio referenced this pull request from a commit

2026-08-18 17:15:26 +00:00

Merge pull request 'Document merge style as a per-repo Forgejo setting' (#29) from docs/default-merge-type-is-merge into main

geusebio referenced this pull request from a commit

2026-08-18 17:18:06 +00:00

Bump agent-standards to document merge style as a per-repo setting