Skip to content

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

Merged
uklotzde merged 4 commits intomixxxdj:mainfrom
daschuer:dont_rebase
Oct 24, 2021
Merged

Improve description why we don't want to rebased PRs#4464
uklotzde merged 4 commits intomixxxdj:mainfrom
daschuer:dont_rebase

Conversation

@daschuer
Copy link
Copy Markdown
Member

No description provided.

@uklotzde
Copy link
Copy Markdown
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
Copy Markdown
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
Copy Markdown
Member Author

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

Comment thread CONTRIBUTING.md Outdated
Co-authored-by: ronso0 <ronso0@mixxx.org>
Copy link
Copy Markdown
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