Uh oh!
There was an error while loading. Please reload this page.
chore: real merge commit to unblock PR #57 - #59
Merged
Conversation
Add label type=system
optional runtime class name for GPU joBs in k3s
Update Helm chart versions to 1.0.0 for aks, bm, and eks; increment a…ppVersion to 1.24.10, update creation timestamps and digests in index.yaml.
Update Helm chart versions to 1.0.1 for aks, bm, and eks;
updated to 1.0.1
Update Helm chart versions to 1.0.2 for aks, bm, and eks
Update Helm chart versions to 1.0.2 for aks, bm, and eks
Update Helm chart versions to 1.0.3 for aks, bm, and eks; increment appVersion to 1.24.13
new helm-chart
Update Helm chart version to 2.0.1 for tracebloc,
Update index.yaml with new creation timestamps for existing Helm charts
Refactor Helm chart release workflow to improve packaging and commit logic
Update Helm chart version from 2.0.1 to 1.0.0, reflecting a major version change for tracebloc
Enhance Helm chart release workflow by adding cleanup step for local chart packages.
Update Helm chart version to 1.0.1 and appVersion to 1.24.15
renamed tracebloc to client
Update Helm chart release workflow to use 'client' naming convention
Rename Helm chart from 'tracebloc' to 'client' in Chart.yaml for consistency with new naming convention.
Enhance MySQL deployment configuration in Helm chart
Update Helm chart version to 1.0.1 and appVersion to 1.0.1 for client
Add installation of Tracebloc client Helm chart to script (#30)
readme updated
readme updated
improved logging and messaging
Refactor Docker status check in install-k8s.ps1
fix: windows script
chore: add narrow CODEOWNERS for security-sensitive paths
PR #58 merged main -> develop earlier, but was squash-merged. Squash drops the merge-commit parent link, so main's commits never joined develop's ancestry. That means PR #57 (develop -> main) keeps re- surfacing the same README conflict: git finds a common ancestor that has neither branch's current README content. This PR creates a real merge commit so that main becomes a true ancestor of develop. Once this lands, PR #57 should have no conflicts. Conflict resolved: README.md — kept develop's version (which is main's post-rewrite README + the `## Security` section added in #44). IMPORTANT FOR MERGER: merge this PR using "Create a merge commit". Do NOT squash and do NOT rebase — either of those will strip the merge-commit parent and reproduce the exact problem this PR exists to fix. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
aptracebloc
approved these changes
Apr 24, 2026
Uh oh!
There was an error while loading. Please reload this page.
This was referenced Jun 3, 2026
Merged
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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Summary
Creates a real merge commit of main into develop so that main becomes a true ancestor. This unblocks PR #57.
Why PR #58 wasn't enough
PR #58 did merge main into develop, but it was squash-merged — squash collapses both parents into a single linear commit, so main's commits never joined develop's ancestry. Git therefore keeps finding a common ancestor of develop and main that has neither branch's current README content, and PR #57 keeps showing the same conflict.
Conflict resolution
Single file:
README.md. Kept develop's version — it's main's post-rewrite short README plus the## Securitysection added in #44. No content lost.Use "Create a merge commit" when merging this PR. Do NOT squash, do NOT rebase. Either will strip the merge-commit parent and reproduce the exact problem this PR exists to fix.
If your repo default is squash-merge, override it for this PR via the dropdown on the green merge button.
Test plan
git merge --no-ff origin/mainoff develop conflicts only on README.md.## Securitysection.--no-ff),git log --graph origin/develop..origin/mainshould be empty — proving main is now an ancestor.Note
Low Risk
No functional code changes; this is intended to fix branch ancestry/merge history, so risk is limited to potential workflow/merge-management impacts.
Overview
This PR introduces no content/code changes in the diff; it is intended to land as a true merge commit of
mainintodevelopso Git history reflectsmainas an ancestor and downstream PRs stop repeatedly surfacing the same conflict (notably aroundREADME.md).Reviewed by Cursor Bugbot for commit 8b4823d. Bugbot is set up for automated code reviews on this repo. Configure here.