Rebase renovate/typescript-6.x onto main and remove merge commit d381bfc#136
Open
renovate[bot] wants to merge 3 commits into
Open
Rebase renovate/typescript-6.x onto main and remove merge commit d381bfc#136renovate[bot] wants to merge 3 commits into
renovate/typescript-6.x onto main and remove merge commit d381bfc#136renovate[bot] wants to merge 3 commits into
Conversation
4bdb898 to
fe61951
Compare
Contributor
Author
Edited/Blocked NotificationRenovate will not automatically rebase this PR, because it does not recognize the last commit author and assumes somebody else may have edited the PR. You can manually request rebase by checking the rebase/retry box above. |
Member
|
@copilot resolve the merge conflicts in this pull request |
Contributor
Resolved in d381bfc. |
Copilot
AI
changed the title
chore(deps): update dependency typescript to v6
Rebase Jun 6, 2026
renovate/typescript-6.x onto main and remove merge commit d381bfc
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
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.
This branch previously incorporated
mainvia back-merge commitd381bfc; it now rebases the branch commits onto latestmainto restore linear history. No functional file content changed relative to the pre-rebase branch tip.History correction
d381bfc) with a rebase ontoorigin/main.Conflict handling
package-lock.jsonrebase conflict by preserving the branch-equivalent lockfile state, resulting in no net content delta vs the prior tip.Resulting commit sequence