8000 Prefer merge over rebase by methane · Pull Request #549 · python/devguide · GitHub
[go: up one dir, main page]
Skip to content

Prefer merge over rebase #549< 8000 /span>

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Nov 17, 2019
Merged

Prefer merge over rebase #549

merged 1 commit into from
Nov 17, 2019

Conversation

methane
Copy link
Member
@methane methane commented Oct 31, 2019

"rebase upstream/master" and "push -f" workflow may corrupt pull request.
See https://discuss.python.org/t/info-rebase-origin-maseter-push-f-workflow-corrupts-pull-request-rarely/2558/3.

And see also #496.

taleinat
taleinat approved these changes Nov 17, 2019
View reviewed changes
Copy link
Contributor
@taleinat taleinat left a comment

Choose a reason for hiding this comment

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

LGTM

@taleinat taleinat merged commit c9eb59a into python:master Nov 17, 2019
@terryjreedy
Copy link
Member

Thanks to both of you.

@methane methane deleted the merge-over-rebase branch April 11, 2022 04:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@taleinat taleinat taleinat approved these changes

Assignees
No one assigned
Labels
CLA signed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@methane @terryjreedy @taleinat @the-knights-who-say-ni
0