Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ci/CD Automatic conflict resolving does not work #1113

Open
VitalyGushin opened this issue May 16, 2024 · 2 comments
Open

Ci/CD Automatic conflict resolving does not work #1113

VitalyGushin opened this issue May 16, 2024 · 2 comments
Assignees
@Ex4amp1e
Labels
bug Something isn't working

Comments

@VitalyGushin
Copy link

#1111
#1112
@VitalyGushin VitalyGushin converted this from a draft issue May 16, 2024
@VitalyGushin VitalyGushin moved this to Todo in Release v1.14.0 May 16, 2024
@denis-tingaikin denis-tingaikin changed the title Automatic conflict resolving does not work Ci/CD Automatic conflict resolving does not work May 16, 2024
@denis-tingaikin denis-tingaikin added the bug Something isn't working label May 16, 2024
@NikitaSkrynnik
Copy link
Contributor

NikitaSkrynnik commented May 17, 2024 •
edited
Loading

Another Issue

When we have conflicts in PRs ci workflow doesn't start. We should check and resolve any conflicts on PR creation. Steps:

  1. Copy check-mergeability and resolve-conflicts jobs and put them after this job
  2. Remove this condition from the copied check-mergeability job
  3. Add needs: [auto-pull-request] into conditions of the copied check-mergeability job

@denis-tingaikin denis-tingaikin moved this from Todo to In Progress in Release v1.14.0 May 23, 2024
@Ex4amp1e Ex4amp1e mentioned this issue May 27, 2024
Merged
@NikitaSkrynnik NikitaSkrynnik moved this from In Progress to Under review in Release v1.14.0 May 27, 2024
@Ex4amp1e Ex4amp1e mentioned this issue May 28, 2024
Draft
@Ex4amp1e
Copy link
Contributor

Action plan

  1. Finish Added comment with draft field info to reuse .github#78
  2. Test Check and resolve conflicts on PR creation #1118
  3. Provide fix from [2] to https://github.com/networkservicemesh/cmd-template

@Ex4amp1e Ex4amp1e removed their assignment May 28, 2024
@denis-tingaikin denis-tingaikin moved this from Under review to Moved to next release in Release v1.14.0 Sep 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@Ex4amp1e Ex4amp1e

Labels
bug Something isn't working
Projects
Release v1.14.0
Status: Moved to next release
Release v1.14.1
Status: No status
Milestone
No milestone
Development

No branches or pull requests
4 participants
@VitalyGushin @denis-tingaikin @Ex4amp1e @NikitaSkrynnik