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.

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

explain merge+no rebase in CONTRIBUTING.md #9427

Merged
merged 1 commit into from
Nov 17, 2023
Merged

explain merge+no rebase in CONTRIBUTING.md #9427

merged 1 commit into from
Nov 17, 2023

Conversation

geekosaur
Copy link
Collaborator

Template Β: This PR does not modify cabal behaviour (documentation, tests, refactoring, etc.)

Include the following checklist in your PR:

ffaf1
ffaf1 approved these changes Nov 8, 2023
View reviewed changes
Copy link
Collaborator

@ffaf1 ffaf1 left a comment

Choose a reason for hiding this comment

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

Hopefully least popular label ever.

ulysses4ever
ulysses4ever approved these changes Nov 8, 2023
View reviewed changes
Copy link
Collaborator

@ulysses4ever ulysses4ever left a comment

Choose a reason for hiding this comment

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

Thanks 👍 Should have been done along with the change to Mergify config, but now you know I'm bad at docs...

@ulysses4ever ulysses4ever changed the title add merge+no rebase explain merge+no rebase in CONTRIBUTING.md Nov 8, 2023
@geekosaur geekosaur added the merge me Tell Mergify Bot to merge label Nov 8, 2023
@geekosaur
Copy link
Collaborator Author

Uh? I didn't change anything that would cause this? And it looks like they're expected-to-fail tests?

Mikolaj
Mikolaj approved these changes Nov 9, 2023
View reviewed changes
Copy link
Member

@Mikolaj Mikolaj 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 so much.

@ulysses4ever
Copy link
Collaborator

@mergify rebase

@mergify Mergify
Copy link
Contributor

mergify bot commented Nov 9, 2023

rebase

✅ Branch has been successfully rebased

@ulysses4ever ulysses4ever force-pushed the contributing-no-rebase branch from 57b4e94 to 1a6e055 Compare November 9, 2023 16:11
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Nov 11, 2023
@Mikolaj Mikolaj mentioned this pull request Nov 17, 2023
Merged
1 task
@Mikolaj
Copy link
Member

Mikolaj commented Nov 17, 2023

Let me rebase to repeat CI halted by the curl problem.

@Mikolaj
Copy link
Member

Mikolaj commented Nov 17, 2023

@mergify rebase

@geekosaur @Mikolaj
add merge+no rebase
a7d28ee 
and a few typos while reviewing
@mergify Mergify
Copy link
Contributor

mergify bot commented Nov 17, 2023

rebase

✅ Branch has been successfully rebased

@Mikolaj Mikolaj force-pushed the contributing-no-rebase branch from 1a6e055 to a7d28ee Compare November 17, 2023 13:57
@ulysses4ever
Copy link
Collaborator

Why is it running Validate? I thought @BinderDavid made it so that non-code modifications didn't need to run it. By the way, is it documented?

@BinderDavid
Copy link
Contributor

Why is it running Validate? I thought @BinderDavid made it so that non-code modifications didn't need to run it. By the way, is it documented?

I did not do a finegrained analysis on what counts as code and what as documentation. Currently only changes which are restricted to the docs/ subdirectory are recognized as documentation changes. But I could easily add the README.md and the CONTRIBUTING.md to the list.

@Mikolaj
Copy link
Member

Mikolaj commented Nov 17, 2023

There are also READMEs in subdirs and they'd qualify IMHO.

@mergify mergify bot merged commit b368a38 into master Nov 17, 2023
45 checks passed
@mergify mergify bot deleted the contributing-no-rebase branch November 17, 2023 16:05
@ulysses4ever
Copy link
Collaborator

@BinderDavid that would be super helpful, if you have time for it. Thanks for chiming in!

@ffaf1 ffaf1 mentioned this pull request Mar 28, 2024
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ffaf1 ffaf1 ffaf1 approved these changes

@ulysses4ever ulysses4ever ulysses4ever approved these changes

@Mikolaj Mikolaj Mikolaj approved these changes

Assignees
No one assigned
Labels
merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@geekosaur @ulysses4ever @Mikolaj @BinderDavid @ffaf1