Skip to content

update-pr-from-base-branch - Allow rebasing#9113

Merged
SunsetTechuila merged 22 commits into
mainfrom
rebase
Mar 30, 2026
Merged

update-pr-from-base-branch - Allow rebasing#9113
SunsetTechuila merged 22 commits into
mainfrom
rebase

Conversation

@SunsetTechuila
Copy link
Copy Markdown
Member

@SunsetTechuila SunsetTechuila commented Mar 23, 2026 •
edited
Loading

resolves #5384

resolves #9072

Test URLs

Screenshot

image image

@github-actions github-actions Bot added the bug label Mar 23, 2026
SunsetTechuila
SunsetTechuila commented Mar 23, 2026
View reviewed changes
Comment thread source/features/update-pr-from-base-branch.tsx Outdated
@SunsetTechuila

This comment was marked as outdated.

Sign in to view
@SunsetTechuila SunsetTechuila marked this pull request as ready for review March 23, 2026 04:42
fregante
fregante previously requested changes Mar 23, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@fregante fregante left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Rebase" would be more likely to be supported if we use a simple UI like grouped buttons, like Update branch | Rebase. I'm open to alternative and simple UIs.

Alt-click could also be ok even if less discoverable (a tooltip would help)

@SunsetTechuila
Copy link
Copy Markdown
Member Author

SunsetTechuila commented Mar 23, 2026 •
edited
Loading

"Rebase" would be more likely to be supported if we use a simple UI like grouped buttons, like Update branch | Rebase.

Very good suggestion

@SunsetTechuila SunsetTechuila requested a review from fregante March 23, 2026 06:17
@fregante
Copy link
Copy Markdown
Member

fregante commented Mar 23, 2026

Code and buttons look good, but I'd prefer "update branch" if there's room. Not strictly necessary though

@fregante fregante dismissed their stale review March 23, 2026 08:46

okie dokie

SunsetTechuila
SunsetTechuila commented Mar 24, 2026
View reviewed changes
Comment thread source/features/update-pr-from-base-branch.tsx
@SunsetTechuila SunsetTechuila mentioned this pull request Mar 24, 2026
Merged
@SunsetTechuila SunsetTechuila force-pushed the rebase branch 2 times, most recently from 9f15923 to 8787175 Compare March 24, 2026 09:01
@fregante fregante changed the title update-pr-from-base-branch - Allow rebasing update-pr-from-base-branch - Allow rebasing Mar 24, 2026
@SunsetTechuila SunsetTechuila mentioned this pull request Mar 27, 2026
Closed
fregante
fregante approved these changes Mar 30, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@fregante fregante left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. One last check before merging would be to see how it behaves on small viewports, to make sure it doesn't cause some bad wrapping

@SunsetTechuila
Copy link
Copy Markdown
Member Author

SunsetTechuila commented Mar 30, 2026 •
edited
Loading

It behaves exactly like the native button

image

@SunsetTechuila SunsetTechuila enabled auto-merge (squash) March 30, 2026 11:00
@SunsetTechuila SunsetTechuila merged commit 1983818 into main Mar 30, 2026
8 checks passed
@SunsetTechuila SunsetTechuila deleted the rebase branch March 30, 2026 11:00
@sakshamgoyal-01
Copy link
Copy Markdown

sakshamgoyal-01 commented Mar 30, 2026

how long will it take before this gets released? This is super nice to have

@fregante
Copy link
Copy Markdown
Member

fregante commented Mar 30, 2026 •
edited
Loading

Probably one more week or v26.4.4

@SunsetTechuila SunsetTechuila mentioned this pull request Apr 29, 2026
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fregante fregante fregante approved these changes

Assignees

No one assigned

Labels

enhancement

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

update-pr-from-base-branch - update button is misplaced on "Merge status" sidebar Allow rebasing in update-pr-from-base-branch

3 participants

@SunsetTechuila @fregante @sakshamgoyal-01