Repository navigation
Upstream pingdotgg/t3code@107f6024ea47 into atli (tip cfafb4bb54d2 conflicts at cb65643b076c) - #24
Open
atli-skald[bot] wants to merge 27 commits into
Open
atli-skald[bot] wants to merge 27 commits into
atli-skald[bot] wants to merge 27 commits into
Conversation
…dotgg#18369) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#12474) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com> Co-authored-by: Yash Singh <saiansh2525@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#12469) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com> Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…tgg#12465) Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…nger drop clients (pingdotgg#19205) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#19207) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… Google group (pingdotgg#18955) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…nt finishes (pingdotgg#18996) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#19162) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
…otgg#19160) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
…gdotgg#15864) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…mits (pingdotgg#11368) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This branch has not been deployed
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
12 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.
Skald proposes upstream commit
107f6024ea4786a58a83c921728a113b849de192frompingdotgg/t3code(main) foratli, merged onto base745f78d54c0750a95fd242962c880261825f39c9.It merges cleanly, and
cb65643b076c79cfe39a5197553b143889da64ab, the next upstream commit after it on the first-parent chain, does not; nor does the frozen upstream tipcfafb4bb54d244e4612f5681aad3832ea64cb0fb. When the conflicts persist fromcb65643b076c79cfe39a5197553b143889da64abforward, the usual case,107f6024ea4786a58a83c921728a113b849de192is the newest upstream commit that merges cleanly. Skald's search probes only some commits, so a later one could still merge cleanly. Skald resolves no conflict, socb65643b076c79cfe39a5197553b143889da64aband the upstream commits after it wait for the owner.Merge this pull request with a merge commit. Do not squash or rebase it: the merge commit is what carries the upstream history into this fork, and a squash or rebase drops that ancestry.