Remove some steps from resolve-conflicts workflow #73
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
Signed-off-by: NikitaSkrynnik <[email protected]>
There was a problem hiding this comment.
As I recall, we decided to apply another kind of fix for the issue.
@Ex4amp1e Could you remind?
|
I think we need to use something like this: It will show all the commits in the current branch and won't add any commits from the main branch |
|
Created an issue where a better solution for this problem is described: #84 |
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
Remove an unneeded condition from
resolve-conflictworkflow. This condition checks if the workflow has already tried to resolve conflicts in previous 10 commits. The problem is if a PR has less then 10 commits then the condition also checksmainbranch. If there are resolved conflicts from other PRs in the main branch they will be taken into account too. Therefore, sometimes this workflow doesn't work because of other PRs.Issue
networkservicemesh/cmd-forwarder-vpp#1102