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

SKA: Misc code enhancements to reduce merge conflicts #204785

Merged
merged 3 commits into from
Dec 19, 2024
Merged

SKA: Misc code enhancements to reduce merge conflicts #204785

merged 3 commits into from
Dec 19, 2024
+35 −11

Conversation

gsoldevila
Copy link
Contributor

@gsoldevila gsoldevila commented Dec 18, 2024 •
edited by kibanamachine
Loading

Summary

  • packages/kbn-babel-preset/styled_components_files.js

    • unfolded a|b patterns
    • removed duplicates
    • removed incorrect patterns

  • x-pack/.gitignore

    • move plugin patterns to specific .gitignore files

@gsoldevila gsoldevila added Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc release_note:skip Skip the PR/issue when compiling release notes backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) labels Dec 18, 2024
@gsoldevila gsoldevila requested review from a team as code owners December 18, 2024 15:49
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-core (Team:Core)

@gsoldevila gsoldevila mentioned this pull request Dec 18, 2024
Merged
@gsoldevila gsoldevila force-pushed the fix-styled-components-files branch from 71a660a to 9ce78ab Compare December 18, 2024 15:58
@gsoldevila gsoldevila force-pushed the fix-styled-components-files branch from 9ce78ab to 71b506a Compare December 18, 2024 16:05
@gsoldevila gsoldevila enabled auto-merge (squash) December 18, 2024 16:58
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

@gsoldevila gsoldevila merged commit e8e4e75 into elastic:main Dec 19, 2024
8 checks passed
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.x

https://github.com/elastic/kibana/actions/runs/12408728828

@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
❌ 8.x Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 204785

Questions ?

Please refer to the Backport tool documentation

JoseLuisGJ pushed a commit to JoseLuisGJ/kibana that referenced this pull request Dec 19, 2024
@gsoldevila @JoseLuisGJ
SKA: Misc code enhancements to reduce merge conflicts (elastic#204785)
e2f5964 
## Summary

* `packages/kbn-babel-preset/styled_components_files.js`
  * unfolded `a|b` patterns
  * removed duplicates
  * removed incorrect patterns

* `x-pack/.gitignore`
  * move plugin patterns to specific `.gitignore` files
@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Dec 20, 2024
@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

5 similar comments
@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 204785 locally

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Dosant Dosant Dosant approved these changes

@delanni delanni delanni approved these changes

Assignees
No one assigned
Labels
backport missing Added to PRs automatically when the are determined to be missing a backport. backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) release_note:skip Skip the PR/issue when compiling release notes Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc v9.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@gsoldevila @elasticmachine @kibanamachine @delanni @Dosant