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

feat: add shortcut for elasticsearch #389

Merged
merged 3 commits into from
Jul 5, 2024
Merged

Conversation

iziang
Copy link
Contributor

@iziang iziang commented Jul 4, 2024

No description provided.

@github-actions github-actions bot added the size/S Denotes a PR that changes 10-29 lines. label Jul 4, 2024
@iziang iziang merged commit d963593 into main Jul 5, 2024
10 checks passed
@iziang iziang deleted the support/elasticsearch-shortcut branch July 5, 2024 02:35
@iziang
Copy link
Contributor Author

iziang commented Jul 5, 2024

/cherry-pick release-0.9

@github-actions github-actions bot added this to the Release 0.9.0 milestone Jul 5, 2024
Copy link

github-actions bot commented Jul 5, 2024

🤖 says: Error cherry-picking.

Failed to merge submodule addons (not checked out)
hint: Recursive merging with submodules currently only supports trivial cases.
hint: Please manually handle the merging of each conflicted submodule.
hint: This can be accomplished with the following steps:
hint: - come back to superproject and run:
hint:
hint: git add addons
hint:
hint: to record the above merge or update
hint: - resolve any other conflicts in the superproject
hint: - commit the resulting index in the superproject
hint:
hint: Disable this message with "git config advice.submoduleMergeConflict false"
CONFLICT (submodule): Merge conflict in addons
error: could not apply d963593... feat: add shortcut for elasticsearch (#389)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

Copy link

github-actions bot commented Jul 5, 2024

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/apecloud/kbcli/actions/runs/9802261295

iziang added a commit that referenced this pull request Jul 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/S Denotes a PR that changes 10-29 lines.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants