Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

ci: prevent merge-commits in a PR#2779

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Closed
JohnVillalovos wants to merge1 commit intomainfromjlvillal/stop_merge_commits

Conversation

@JohnVillalovos
Copy link
Member

@JohnVillalovosJohnVillalovos commentedJan 28, 2024•
edited
Loading

Have the CI prevent merge-commits being part of a PR

@JohnVillalovosJohnVillalovos marked this pull request as draftJanuary 28, 2024 02:21
@JohnVillalovosJohnVillalovosforce-pushed thejlvillal/stop_merge_commits branch 7 times, most recently from9f52e07 to6f68505CompareJanuary 28, 2024 02:46
@JohnVillalovosJohnVillalovos marked this pull request as ready for reviewJanuary 28, 2024 02:48
@JohnVillalovosJohnVillalovosforce-pushed thejlvillal/stop_merge_commits branch from6f68505 toe73506eCompareJanuary 28, 2024 02:58
@JohnVillalovosJohnVillalovos changed the titleci: prevent merge-requests in a PRci: prevent merge-commits in a PRJan 28, 2024
@JohnVillalovos
Copy link
MemberAuthor

JohnVillalovos commentedJan 28, 2024•
edited
Loading

Goal of this is to block PRs like:#2780

An example of a PR that did get merged with a merge-commit:#2465

This can happen if a PR gets out of date and the "Update" button is pressed in the WebUI rather than selecting to "Rebase" the PR.

Have the CI prevent merge-commits being part of a PR
@JohnVillalovosJohnVillalovosforce-pushed thejlvillal/stop_merge_commits branch frome73506e tod50bfb4CompareJanuary 29, 2024 16:13
@JohnVillalovos
Copy link
MemberAuthor

This should not be required as we have "Prevent Linear History" set in the settings for the protected branchmain

@nejch
Copy link
Member

Thanks@JohnVillalovos that was my thinking as well. I guess that was merged before we enabled the feature right?

@JohnVillalovos
Copy link
MemberAuthor

Thanks@JohnVillalovos that was my thinking as well. I guess that was merged before we enabled the feature right?

I guess so. There is no history (that I know of) where we can see when settings where changed for the project on GitHub.

@JohnVillalovosJohnVillalovos deleted the jlvillal/stop_merge_commits branchMay 17, 2024 14:55
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@JohnVillalovos@nejch
[8]ページ先頭
©2009-2025 Movatter.jp