Skip to content
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.

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

Improve description why we don't want to rebased PRs #4464

Merged
merged 4 commits into from
Oct 24, 2021

Conversation

daschuer
Copy link
Member

No description provided.

@uklotzde
Copy link
Contributor

At least amending commits seems to work well during reviews, see #4341. I am not sure if all of our assumptions regarding squashing and rebasing on GitHub still hold.

@daschuer
Copy link
Member Author

Yes, amending works and does not interfere require a new full review. This should be covered by the sentence with the ammendig, I have not touched here.

Maybe we should change it as well. As long the last commit is samall, or has a failing CI, ammending can be done at any time, IMHO.

The GiHub cabability of keeping old comments has been improved and can be considered as perfect. The sentence should now reflect that.

@daschuer
Copy link
Member Author

I have decoupled amending from rebasing. Does it fit your needs?

CONTRIBUTING.md Outdated Show resolved Hide resolved
Co-authored-by: ronso0 <ronso0@mixxx.org>
Copy link
Contributor

@uklotzde uklotzde left a comment

Choose a reason for hiding this comment

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

Thank you! LGTM

@uklotzde uklotzde merged commit c99b8ba into mixxxdj:main Oct 24, 2021
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.

3 participants