Skip to content

after merge, switch to base branch if available - #5251

Merged
samcoe merged 4 commits into
cli:trunkfrom
bstncartwright:merge-base-branch
Mar 14, 2022
Merged

samcoe merged 4 commits into
cli:trunkfrom
bstncartwright:merge-base-branch

Conversation

@bstncartwright

Copy link
Copy Markdown
Contributor

Fixes #1096

After merging, previously we would switch to the default branch in the repo. With this change, after merging we switch our branch to the base branch of the pull request. If that is not available, then we fall back to the same behavior as before.

@bstncartwright
bstncartwright requested a review from a team as a code owner February 24, 2022 20:54
@bstncartwright
bstncartwright requested review from samcoe and removed request for a team February 24, 2022 20:54
@cliAutomation cliAutomation added the external pull request originating outside of the CLI core team label Feb 24, 2022
@samcoe samcoe self-assigned this Feb 28, 2022

@samcoe samcoe left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@bstncartwright This looks good to me. Thanks for adding a test!

Comment thread pkg/cmd/pr/merge/merge.go Outdated
@samcoe
samcoe requested a review from mislav March 14, 2022 09:45

@mislav mislav left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks great!

@samcoe
samcoe merged commit bb9bf29 into cli:trunk Mar 14, 2022
@bstncartwright
bstncartwright deleted the merge-base-branch branch March 14, 2022 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

external pull request originating outside of the CLI core team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

PR merge should switch to the base branch instead of the default branch.

4 participants