yuqi1129 commented on PR #12023: URL: https://github.com/apache/gravitino/pull/12023#issuecomment-4981413313
Resolved the conflicts by replacing the bot's commit (which contained unresolved conflict markers) with two clean cherry-picks: 1. `a67dee8d6a` — [#11912] feat(clickhouse): support set data skipping index type (#11916) 2. `c7cd8eb0e2` — [#11946] improvement(api): Add properties field to TableChange.AddIndex (#12013) The conflicts existed because #12013 builds on top of the set data-skipping index support from #11916 (`DATA_SKIPPING_SET` enum value, `set_max_values` handling, related tests/docs), which was not on `branch-1.3`. Picking the prerequisite first makes both commits apply cleanly and keeps these files identical to `main`, avoiding future cherry-pick conflicts. Verified locally: the clickhouse module compiles and non-container unit tests pass. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
