Skip to content

Support HEAD as upstream merge base#9952

Merged
markijbema merged 2 commits into
mainfrom
mark/upstream-merge-head-base
May 6, 2026
Merged

Support HEAD as upstream merge base#9952
markijbema merged 2 commits into
mainfrom
mark/upstream-merge-head-base

Conversation

@kilo-code-bot
Copy link
Copy Markdown
Contributor

@kilo-code-bot kilo-code-bot Bot commented May 6, 2026

Summary

  • Allow --base-branch HEAD in the upstream merge script to resolve to the currently checked-out branch.
  • Document the shortcut and cover the resolver with focused tests.

@kilo-code-bot
Copy link
Copy Markdown
Contributor Author

kilo-code-bot Bot commented May 6, 2026

Code Review Summary

Status: No Issues Found | Recommendation: Merge

Files Reviewed (4 files)
  • script/upstream/README.md
  • script/upstream/merge.ts
  • script/upstream/utils/config.test.ts
  • script/upstream/utils/config.ts

Reviewed by gpt-5.5-2026-04-23 · 256,641 tokens

@markijbema markijbema enabled auto-merge May 6, 2026 09:51
@markijbema markijbema merged commit bb1f2e4 into main May 6, 2026
11 checks passed
@markijbema markijbema deleted the mark/upstream-merge-head-base branch May 6, 2026 10:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants