This is an automated email from the ASF dual-hosted git repository. xiazcy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 62dbd66ab6d71600f223b68f28b81e6637467f15 Merge: cf4cdac477 2c9e5300d6 Author: Yang Xia <[email protected]> AuthorDate: Fri Apr 28 13:22:43 2023 -0700 Merge branch '3.6-dev' CHANGELOG.asciidoc | 1 + .../process/traversal/step/map/MergeEdgeStep.java | 2 +- .../process/traversal/step/map/MergeStep.java | 60 ++++++++++- .../traversal/step/map/MergeVertexStep.java | 40 -------- .../traversal/step/map/MergeVertexStepTest.java | 56 +++++++++++ .../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 9 ++ gremlin-go/driver/cucumber/gremlin.go | 9 ++ .../gremlin-javascript/test/cucumber/gremlin.js | 9 ++ gremlin-python/src/main/python/radish/gremlin.py | 9 ++ .../gremlin/test/features/map/MergeVertex.feature | 110 +++++++++++++++++++++ 10 files changed, 260 insertions(+), 45 deletions(-)
