Add support for custom headers for REST via config. #4046
KiterLucAnnotations
1 error and 2 warnings
|
Backport
Error: Auto-merging tiledb/sm/array_schema/test/CMakeLists.txt
[backport-5104-to-release-2.23 540e19959] Fix check for out of bounds dimension in Dimension::dimension_ptr. (#5094)
Author: Robert Bindar <robertbindar@gmail.com>
Date: Tue Jun 18 16:05:36 2024 +0300
3 files changed, 18 insertions(+), 3 deletions(-)
Auto-merging CMakeLists.txt
CONFLICT (content): Merge conflict in CMakeLists.txt
Auto-merging test/src/unit-capi-array_schema.cc
Auto-merging tiledb/sm/array_schema/array_schema.cc
CONFLICT (content): Merge conflict in tiledb/sm/array_schema/array_schema.cc
Auto-merging tiledb/sm/array_schema/array_schema.h
CONFLICT (content): Merge conflict in tiledb/sm/array_schema/array_schema.h
Auto-merging tiledb/sm/array_schema/array_schema_evolution.cc
CONFLICT (content): Merge conflict in tiledb/sm/array_schema/array_schema_evolution.cc
Auto-merging tiledb/sm/array_schema/array_schema_evolution.h
CONFLICT (content): Merge conflict in tiledb/sm/array_schema/array_schema_evolution.h
CONFLICT (modify/delete): tiledb/sm/array_schema/current_domain.cc deleted in HEAD and modified in f8e8ce9e5 (Current Domain C API implementation. (#5096)). Version f8e8ce9e5 (Current Domain C API implementation. (#5096)) of tiledb/sm/array_schema/current_domain.cc left in tree.
CONFLICT (modify/delete): tiledb/sm/array_schema/current_domain.h deleted in HEAD and modified in f8e8ce9e5 (Current Domain C API implementation. (#5096)). Version f8e8ce9e5 (Current Domain C API implementation. (#5096)) of tiledb/sm/array_schema/current_domain.h left in tree.
CONFLICT (modify/delete): tiledb/sm/array_schema/ndrectangle.cc deleted in HEAD and modified in f8e8ce9e5 (Current Domain C API implementation. (#5096)). Version f8e8ce9e5 (Current Domain C API implementation. (#5096)) of tiledb/sm/array_schema/ndrectangle.cc left in tree.
CONFLICT (modify/delete): tiledb/sm/array_schema/ndrectangle.h deleted in HEAD and modified in f8e8ce9e5 (Current Domain C API implementation. (#5096)). Version f8e8ce9e5 (Current Domain C API implementation. (#5096)) of tiledb/sm/array_schema/ndrectangle.h left in tree.
CONFLICT (modify/delete): tiledb/sm/array_schema/test/unit_current_domain.cc deleted in HEAD and modified in f8e8ce9e5 (Current Domain C API implementation. (#5096)). Version f8e8ce9e5 (Current Domain C API implementation. (#5096)) of tiledb/sm/array_schema/test/unit_current_domain.cc left in tree.
Auto-merging tiledb/sm/c_api/tiledb.cc
Auto-merging tiledb/sm/c_api/tiledb_experimental.h
CONFLICT (modify/delete): tiledb/sm/enums/current_domain_type.h deleted in HEAD and modified in f8e8ce9e5 (Current Domain C API implementation. (#5096)). Version f8e8ce9e5 (Current Domain C API implementation. (#5096)) of tiledb/sm/enums/current_domain_type.h left in tree.
error: could not apply f8e8ce9e5... Current Domain C API implementation. (#5096)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", 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"
|
|
Backport
Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: zephyrproject-rtos/action-backport@7e74f601d11eaca577742445e87775b5651a965f. For more information see: https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/.
|
|
Backport
Your repository allows merge commits.
However, Backport only supports rebased and merged pull requests and squashed and merged pull requests.
Consider only allowing rebase and squash merging.
See https://help.github.com/en/github/administering-a-repository/about-merge-methods-on-github for more information.
|