Skip to content

docs(workflow): 补充保持 main 线性的交付规则#42

Merged
iamsyc merged 1 commit intomainfrom
codex/agents-main-linear
Mar 18, 2026
Merged

docs(workflow): 补充保持 main 线性的交付规则#42
iamsyc merged 1 commit intomainfrom
codex/agents-main-linear

Conversation

@iamsyc
Copy link
Copy Markdown
Owner

@iamsyc iamsyc commented Mar 18, 2026

What Changed

  • added a delivery-flow rule to define what "keep main linear" means in this repository
  • documented the required branch update step before PR open or merge
  • documented the merge strategy preference to avoid merge commits on main

Why

  • the previous wording was implicit and could be interpreted inconsistently
  • this makes future PR delivery behavior precise and repeatable

Validation

  • inspected the AGENTS.md diff
  • ran git diff --check -- AGENTS.md

- 明确工作分支在开 PR 或合并前需对齐最新 main
- 明确 main 上只能增加单个线性提交且不能产生 merge commit
- 明确仓库支持时优先使用 squash merge 否则使用 rebase merge
@github-actions
Copy link
Copy Markdown

CI Summary

Run: Open

Check Status Details
Change Scope non_code non-code pull request fast-path
Unit Tests skipped skipped; non-code pull request
UI Smoke Tests (matrix: baseline + permissionDenied + rebuildFailed) skipped skipped; non-code pull request
Release Build Check (Release arch smoke: arm64 + x86_64) skipped skipped; non-code pull request
CI Gate success required; non-code PR fast-path

Gate rule: 本次 PR 仅包含非代码变更,已跳过 Unit Tests / UI Smoke Tests / Release Build Checkci-gate 直接通过。

@iamsyc iamsyc merged commit 730d4b7 into main Mar 18, 2026
6 checks passed
@iamsyc iamsyc deleted the codex/agents-main-linear branch March 18, 2026 18:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant