Repository navigation
Ops: temporary helpers to merge PR #9 (do not merge) - #10
Open
xiaohai1314-sys wants to merge 10 commits into
Open
xiaohai1314-sys wants to merge 10 commits into
xiaohai1314-sys wants to merge 10 commits into
Conversation
This workflow automates the merging of pull request 9 into the main branch, resolving conflicts and verifying changes. It includes steps for checking out the repository, merging upstream changes, and handling specific conflict resolutions for multiple files.
Added Node.js setup action with caching for npm dependencies.
Added caching for Go build dependencies to optimize workflow performance.
Update comparison logic for build errors in merge PR workflow.
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
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.
Temporary operational PR: it exists only so the pull_request-triggered workflow
.github/workflows/merge-pr9.ymlon this branch can resolve the 8 merge conflicts of PR #9 and push the resulting merge commit to main. This PR itself will be closed without merging and its branch kept.