Skip to content

Unwanted merge commits in PR #22397

Discussion options

You must be logged in to vote

Those commits look like you merged updates from the branch that you’re trying to merge into. If you want to avoid that, the best solution is probably to start a fresh branch from the current state of the upstream branch, and cherry-pick your commit on top of that.

If you want to avoid such merge commits in the future, you can rebase your branch on top of upstream changes instead of merging them.

Replies: 2 comments

Comment options

You must be logged in to vote
0 replies
Answer selected
Comment options

You must be logged in to vote
0 replies
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants