Conversation
## Problem PR #1199 showed **19 commits and 6 changed files** when only **1 commit** (d151470) was genuinely new. The PR was unmergeable (`mergeable_state: dirty`). **Root cause:** Squash-merge of PR #1196 created an orphan commit on `lts` that Git cannot trace back to any `main` commit. This permanently froze the merge base at `ff85922`, causing GitHub to compute the PR diff from that ancient point — including all historical commits in every future promotion PR. This problem **compounds over time** — each squash-merge adds another orphan, and the commit/diff bloat grows without bound. ## Solution Switch promotion PRs from squash-merge to **regular merge** (Create a merge commit). Regular merge creates a commit with two parents, advancing the merge base so future PRs only contain genuinely new commits. **Verified locally:** | Strategy | After 1 cycle | After 2 cycles | After N cycles | |---|---|---|---| | Squash merge | 1 commit ✅ | 2 commits ❌ | N commits (grows forever) ❌ | | Regular merge | 1 commit ✅ | 1 commit ✅ | 1 commit ✅ | ## Changes - **`create-lts-pr.yml`**: Simplified commit list logic — use `git log lts..main` directly (the tree-hash anchor workaround is no longer needed). Updated PR body to instruct maintainers to merge, not squash. - **`AGENTS.md`**: Documented that promotion PRs must use regular merge, with explicit warning against squash-merge. ## Pre-requisite (already done) The merge base was repaired by merging `main` into `lts` with a regular merge commit (`d5a0149`). Current state: merge base = `d151470`, zero content diff, identical trees. PR #1199 should be closed. Assisted-by: Claude Opus 4.6 via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…/caffeine digest to 2fafa49 (#1200) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [system_files/usr/share/gnome-shell/extensions/tmp/caffeine](https://redirect.github.com/eonpatapon/gnome-shell-extension-caffeine.git) ([changelog](https://redirect.github.com/eonpatapon/gnome-shell-extension-caffeine.git/compare/873a1b03cd4e0eeda2932e02d9b9d72a4d47f6a7..2fafa49faa13e3507409b862a5c75c9d4c86de03)) | digest | `873a1b0` → `2fafa49` | --- > [!WARNING] > Some dependencies could not be looked up. Check the [Dependency Dashboard](../issues/549) for more information. --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Never, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My43Ny44IiwidXBkYXRlZEluVmVyIjoiNDMuNzcuOCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==--> Co-authored-by: ubot-7274[bot] <217212047+ubot-7274[bot]@users.noreply.github.com>
…t to 550e0d6 (#1203) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | cgr.dev/chainguard/wolfi-base | container | digest | `2a43204` → `550e0d6` | --- > [!WARNING] > Some dependencies could not be looked up. Check the [Dependency Dashboard](../issues/549) for more information. --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Never, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My43Ny44IiwidXBkYXRlZEluVmVyIjoiNDMuNzcuOCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==--> Co-authored-by: ubot-7274[bot] <217212047+ubot-7274[bot]@users.noreply.github.com>
…est to 56d49d1 (#1204) This PR contains the following updates: | Package | Update | Change | |---|---|---| | quay.io/centos-bootc/centos-bootc | digest | `54b49be` → `56d49d1` | --- > [!WARNING] > Some dependencies could not be looked up. Check the [Dependency Dashboard](../issues/549) for more information. --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Never, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My43OC4wIiwidXBkYXRlZEluVmVyIjoiNDMuNzguMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==--> Co-authored-by: ubot-7274[bot] <217212047+ubot-7274[bot]@users.noreply.github.com>
…indicatorsupport@rgcjonas.gmail.com digest to 5f21a79 (#1205) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [system_files/usr/share/gnome-shell/extensions/appindicatorsupport@rgcjonas.gmail.com](https://redirect.github.com/ubuntu/gnome-shell-extension-appindicator.git) ([changelog](https://redirect.github.com/ubuntu/gnome-shell-extension-appindicator.git/compare/be68add0382b1ee19eb8e851464e3a3ac6900c6a..5f21a790e20537681c51670cbfe2a5f2688cca2e)) | digest | `be68add` → `5f21a79` | --- > [!WARNING] > Some dependencies could not be looked up. Check the [Dependency Dashboard](../issues/549) for more information. --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Never, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My44Mi4wIiwidXBkYXRlZEluVmVyIjoiNDMuODIuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==--> Co-authored-by: ubot-7274[bot] <217212047+ubot-7274[bot]@users.noreply.github.com>
…t to 73de6aa (#1206) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | cgr.dev/chainguard/wolfi-base | container | digest | `550e0d6` → `73de6aa` | --- > [!WARNING] > Some dependencies could not be looked up. Check the [Dependency Dashboard](../issues/549) for more information. --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Never, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My44My4wIiwidXBkYXRlZEluVmVyIjoiNDMuODMuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==--> Co-authored-by: ubot-7274[bot] <217212047+ubot-7274[bot]@users.noreply.github.com>
…h-to-dock@micxgx.gmail.com digest to 57ac68f (#1208) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [system_files/usr/share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com](https://redirect.github.com/micheleg/dash-to-dock.git) ([changelog](https://redirect.github.com/micheleg/dash-to-dock.git/compare/0f21b6b9baf504d6e6972e9ea8041240ceadfdc9..57ac68fdaabdac7a9cd4bd5fa2bf59dc07db5c32)) | digest | `0f21b6b` → `57ac68f` | --- > [!WARNING] > Some dependencies could not be looked up. Check the [Dependency Dashboard](../issues/549) for more information. --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Never, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://redirect.github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My44NC4wIiwidXBkYXRlZEluVmVyIjoiNDMuODQuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==--> Co-authored-by: ubot-7274[bot] <217212047+ubot-7274[bot]@users.noreply.github.com>
dosubot
bot
added
size:M
|
Related Documentation 1 document(s) may need updating based on files changed in this PR: bluefin Universal Blue Build and Update SystemView Suggested Changes@@ -67,6 +67,7 @@
- Triggers automatically on every push to `main`
- Checks `git diff --quiet origin/lts origin/main` (content diff)
- Creates or updates a draft PR from `main` → `lts` when differences exist
+- Lists commits since the last promotion using `git log origin/lts..origin/main` (works with regular merge history)
- Requires manual merge (Create a merge commit) via GitHub UI as approval gate
- **CRITICAL RULE**: NEVER commit directly to `lts` — all changes must land in `main` first
Note: You must be authenticated to accept/decline updates. How did I do? Any feedback? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Commits pending promotion to
lts96d99f5 chore(deps): update system_files/usr/share/gnome-shell/extensions/dash-to-dock@micxgx.gmail.com digest to 57ac68f (#1208)
28a7701 chore(deps): update cgr.dev/chainguard/wolfi-base:latest docker digest to 73de6aa (#1206)
789460b chore(deps): update system_files/usr/share/gnome-shell/extensions/appindicatorsupport@rgcjonas.gmail.com digest to 5f21a79 (#1205)
f662cb5 chore(deps): update quay.io/centos-bootc/centos-bootc:c10s docker digest to 56d49d1 (#1204)
f93db5a chore(deps): update cgr.dev/chainguard/wolfi-base:latest docker digest to 550e0d6 (#1203)
3f031ba chore(deps): update system_files/usr/share/gnome-shell/extensions/tmp/caffeine digest to 2fafa49 (#1200)
120a359 fix(ci): use regular merge for promotion PRs instead of squash (#1201)
Merge this PR (Create a merge commit) to promote. Do NOT squash — squash-merge breaks the merge base and causes PR bloat. The PR body updates automatically as
mainadvances.