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.

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

Attempt to handle automatic conflict resolution for local backports #93533

Open
spalger opened this issue Mar 3, 2021 · 1 comment
Open

Attempt to handle automatic conflict resolution for local backports #93533

spalger opened this issue Mar 3, 2021 · 1 comment
Assignees
Labels
Team:Operations Team label for Operations Team

Comments

@spalger
Copy link
Contributor

spalger commented Mar 3, 2021

sorenlouv/backport#206 added support for automatic conflict resolution logic in the backport script, which we should try to take advantage of.

Ideally this could be applied via the Github Action at some point, but for now I think it's reasonable to just focus on handling these cases when running backports locally where failures can be debugged easier with access to the filesystem.

My initial plan is to implement resolution for two types of conflicts:

  • yarn.lock run BUILD_TS_REFS_DISABLE=true yarn kbn bootstrap
  • api_docs/**/* run node scripts/build_api_docs
@spalger spalger added the Team:Operations Team label for Operations Team label Mar 3, 2021
@spalger spalger self-assigned this Mar 3, 2021
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-operations (Team:Operations)

@tylersmalley tylersmalley added 1 and removed 1 labels Oct 11, 2021
@exalate-issue-sync exalate-issue-sync bot added impact:low Addressing this issue will have a low level of impact on the quality/strength of our product. loe:small Small Level of Effort labels Oct 12, 2021
@tylersmalley tylersmalley removed loe:small Small Level of Effort impact:low Addressing this issue will have a low level of impact on the quality/strength of our product. EnableJiraSync labels Mar 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Team:Operations Team label for Operations Team
Projects
None yet
Development

No branches or pull requests

3 participants