diff options
| author | Craig Jennings <c@cjennings.net> | 2026-05-10 12:59:07 -0500 |
|---|---|---|
| committer | Craig Jennings <c@cjennings.net> | 2026-05-10 12:59:07 -0500 |
| commit | 549e67670074c82ca9303a647a5c68cf5529959f (patch) | |
| tree | 6e3d154c279ea9f69d6d6b84f7d555936bf3e1f3 /scripts/install-lang.sh | |
| parent | c1e162cc74f00d5251a7a5eedcc8dd7eb9870459 (diff) | |
| download | rulesets-549e67670074c82ca9303a647a5c68cf5529959f.tar.gz rulesets-549e67670074c82ca9303a647a5c68cf5529959f.zip | |
docs(commits): add Step 0 pre-flight reconcile and pre-push check
The publish flow had no fetch step before commit, PR creation, or push. Long sessions or multi-machine work could land local commits on a stale base, producing non-fast-forward push failures that you have to unwind under publish-step pressure.
Step 0 fetches all remotes and checks the current branch against its upstream before Step 1's code review. If the branch is behind, the rule branches on tree state and divergence shape: clean fast-forward, surface dirty-tree behind, or surface a true divergence and ask before rebasing or merging. The Step 0 wording covers the new-branch case (no upstream → skip the divergence check, the first push sets it).
The Pre-push reconcile bullet in Merge Strategy handles the smaller window between Step 0 and the actual push. Reviewing and drafting can take several minutes; another machine or teammate can push during that window. One more fetch immediately before push is cheaper than recovering after a failed push.
Diffstat (limited to 'scripts/install-lang.sh')
0 files changed, 0 insertions, 0 deletions
