Check and resolve conflicts on PR creation #1118
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
added 2 commits
May 27, 2024 12:24
Signed-off-by: Vladislav Byrgazov <vladislav.byrgazov@xored.com>
Ex4amp1e
force-pushed
the
conflict-resolving
branch
from
7ffdba8 to
4825d47
Compare
Comment on lines
13
to
17
| check-mergeability: | ||
| needs: [ auto-pull-request ] | ||
| uses: networkservicemesh/.github/.github/workflows/check-mergeability.yaml@main | ||
| secrets: | ||
| token: ${{ secrets.NSM_BOT_GITHUB_TOKEN }} |
There was a problem hiding this comment.
Do we really need this?
/cc @NikitaSkrynnik
Suggested change
| check-mergeability: | |
| needs: [ auto-pull-request ] | |
| uses: networkservicemesh/.github/.github/workflows/check-mergeability.yaml@main | |
| secrets: | |
| token: ${{ secrets.NSM_BOT_GITHUB_TOKEN }} |
| @@ -9,3 +9,18 @@ jobs: | |||
| uses: networkservicemesh/.github/.github/workflows/pr-for-updates.yaml@main | |||
| secrets: | |||
| token: ${{ secrets.NSM_BOT_GITHUB_TOKEN }} | |||
|
|
|||
There was a problem hiding this comment.
Signed-off-by: Vladislav Byrgazov <vladislav.byrgazov@xored.com>
denis-tingaikin
approved these changes
May 27, 2024
nsmbot
pushed a commit
to networkservicemesh/deployments-k8s
that referenced
this pull request
May 27, 2024
…d-forwarder-vpp@main PR link: networkservicemesh/cmd-forwarder-vpp#1118 Commit: 8e1e447 Author: Vladislav Byrgazov Date: 2024-05-27 18:25:13 +0800 Message: - Check and resolve conflicts on PR creation (#1118) Signed-off-by: Vladislav Byrgazov <vladislav.byrgazov@xored.com> Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
nsmbot
added a commit
to networkservicemesh/deployments-k8s
that referenced
this pull request
May 27, 2024
…d-forwarder-vpp@main (#12038) PR link: networkservicemesh/cmd-forwarder-vpp#1118 Commit: 8e1e447 Author: Vladislav Byrgazov Date: 2024-05-27 18:25:13 +0800 Message: - Check and resolve conflicts on PR creation (#1118) Signed-off-by: Vladislav Byrgazov <vladislav.byrgazov@xored.com> Signed-off-by: NSMBot <nsmbot@networkservicmesh.io> Co-authored-by: NSMBot <nsmbot@networkservicmesh.io>
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.
Issue: #1113