Skip to content

Rebase renovate/typescript-6.x onto main and remove merge commit d381bfc#136

Open
renovate[bot] wants to merge 3 commits into
mainfrom
renovate/typescript-6.x
Open

Rebase renovate/typescript-6.x onto main and remove merge commit d381bfc#136
renovate[bot] wants to merge 3 commits into
mainfrom
renovate/typescript-6.x

Conversation

@renovate

@renovate renovate Bot commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

This branch previously incorporated main via back-merge commit d381bfc; it now rebases the branch commits onto latest main to restore linear history. No functional file content changed relative to the pre-rebase branch tip.

  • History correction

    • Replaced merge-based integration (d381bfc) with a rebase onto origin/main.
    • Kept the branch’s two logical commits intact, replayed in order.
  • Conflict handling

    • Resolved the package-lock.json rebase conflict by preserving the branch-equivalent lockfile state, resulting in no net content delta vs the prior tip.
  • Resulting commit sequence

    bc06af7  (origin/main)
    ├─ 919e059  chore(deps): update dependency typescript to v6
    └─ ed7bf13  fix: support TypeScript 6 plugin build
    

@renovate renovate Bot requested a review from a team as a code owner June 3, 2026 04:45
@renovate renovate Bot added the dep-bump label Jun 3, 2026
@renovate renovate Bot force-pushed the renovate/typescript-6.x branch from 4bdb898 to fe61951 Compare June 3, 2026 04:49
Copilot finished work on behalf of fh1ch June 6, 2026 06:22
Copilot AI requested a review from fh1ch June 6, 2026 06:22
@renovate

renovate Bot commented Jun 6, 2026

Copy link
Copy Markdown
Contributor Author

Edited/Blocked Notification

Renovate 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.

⚠️ Warning: custom changes will be lost.

@fh1ch

fh1ch commented Jun 6, 2026

Copy link
Copy Markdown
Member

@copilot resolve the merge conflicts in this pull request

Copilot AI commented Jun 6, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Resolved in d381bfc.

Copilot finished work on behalf of fh1ch June 6, 2026 08:24
Copilot AI changed the title chore(deps): update dependency typescript to v6 Rebase renovate/typescript-6.x onto main and remove merge commit d381bfc Jun 6, 2026
Copilot finished work on behalf of fh1ch June 6, 2026 08:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants