chore(ci): introduce merge conflict comments #3088
Merged
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
kellervater
force-pushed
the
infra-gh-566-check-merge-conflicts
branch
from
54cae35 to
0db4d72
Compare
sbuettner
approved these changes
Aug 14, 2024
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.
Description
When pipelines/workflows don't run due to merge conflicts with the base branch, it's not always that obvious.
The newly introduced workflow will check for merge conflicts in PRs labeled
deploy-preview.Furthermore, we'll introduce a quick-cleanup in the
preview-env-deploy.ymlworkflow, which will get rid of the comment as soon as the merge conflict got resolved.Related issues