Add job forbid-merge-commits to .github/workflows/pull-request.yml. #1693
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -298,3 +298,9 @@ jobs: | |||
| MAVEN_OPTS: "-Xmx2g" | |||
| - name: 'Clean Maven cache' | |||
| run: rm -rf ~/.m2/repository/org/eclipse/collections | |||
|
|
|||
| forbid-merge-commits: | |||
There was a problem hiding this comment.
I am not entirely sure if it will immediately be evident to the contributor what their next steps are if this action fails - is it possible to include a section regarding the rebase steps in the contributing guidelines?
There was a problem hiding this comment.
When the check fails, it leaves instructions on how to fix the problem. I can't demonstrate it on this repository until it lands, but I could demonstrate it in another repository if that would be helpful.
There was a problem hiding this comment.
motlin
force-pushed
the
forbid-merge-commits
branch
3 times, most recently
from
2c6503f
to
54a7008
Compare
motlin
force-pushed
the
forbid-merge-commits
branch
3 times, most recently
from
69ac0b9
to
cdb0319
Compare
motlin
force-pushed
the
forbid-merge-commits
branch
from
cdb0319
to
2e75f0e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We recently had a "backwards" merge commit land on the master branch.
It's visible in the git history as the white arrow here.
I wrote and open sourced a GitHub Action to prevent this sort of thing. Its README has more details about why this is a problem and how folks get into this situation. When it happens, the error message is pretty helpful about how to fix up git history.