ci: add auto-rebase and conflict detection workflows#6578
Draft
Ashutoshx7 wants to merge 1 commit intosugarlabs:masterfrom
Draft
ci: add auto-rebase and conflict detection workflows#6578Ashutoshx7 wants to merge 1 commit intosugarlabs:masterfrom
Ashutoshx7 wants to merge 1 commit intosugarlabs:masterfrom
Conversation
- Add auto-rebase.yml: automatically rebases all open PRs onto latest master on every push, using peter-evans/rebase@v4 - Add conflict-check.yml: labels conflicting PRs with 'needs-rebase' and comments with rebase instructions, using eps1lon/actions-label-merge-conflict@v3 - Update PR template: add 'Allow edits from maintainers' checkbox - Update CONTRIBUTING.md: add 'Keeping Your PR Up-to-Date' section with rebase instructions and upstream setup guide
Contributor
|
✅ All Jest tests passed! This PR is ready to merge. |
github-actions
bot
added
feature
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
This par adds automated ci cd rebased
i tested througly on my forks
@walterbender
i wanna know your thoughts
small problem :
This would work onlyy if the author has ticked allow edit from the maintainers .