scovich commented on PR #8342:
URL: https://github.com/apache/arrow-rs/pull/8342#issuecomment-3290168786
> It looks like there is a conflict in this PR
Some kind of github confusion, methinks? The git cli handled it fine 🤷
```
arrow-rs % git merge oss/main
Auto-merging parquet-variant-compute/src/variant_get.rs
Merge made by the 'ort' strategy.
parquet-variant-compute/src/lib.rs
| 1 +
parquet-variant-compute/src/{variant_get/mod.rs => variant_get.rs}
| 10 ++++------
parquet-variant-compute/src/variant_get/output/mod.rs
| 18 ------------------
parquet-variant-compute/src/{variant_get/output/row_builder.rs =>
variant_to_arrow.rs} | 57
++++++++++++++++++++++++++++++++-------------------------
4 files changed, 37 insertions(+), 49 deletions(-)
rename parquet-variant-compute/src/{variant_get/mod.rs => variant_get.rs}
(99%)
delete mode 100644 parquet-variant-compute/src/variant_get/output/mod.rs
rename parquet-variant-compute/src/{variant_get/output/row_builder.rs =>
variant_to_arrow.rs} (73%)
```
--
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]
