This is an automated email from the ASF dual-hosted git repository.
valentyn pushed a commit to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 0cca38ba965d0929b6559e92559f031223f7e72b
Merge: 72fdc23acf a1a3009b71
Author: Valentyn Kahamlyk <valentyn.kaham...@improving.com>
AuthorDate: Thu Jan 18 09:39:54 2024 -0800
resolve merge conflict
CHANGELOG.asciidoc | 1 +
.../gremlin/process/traversal/Contains.java | 15 +++++
.../process/traversal/step/util/BulkSet.java | 58 +++++++++++++++++++
.../process/traversal/ContainsBulkSetTest.java | 65 +++++++++++++++++++++
.../process/traversal/step/util/BulkSetTest.java | 66 +++++++++++++++++++++-
5 files changed, 204 insertions(+), 1 deletion(-)
