alamb commented on PR #3514:
URL: https://github.com/apache/arrow-rs/pull/3514#issuecomment-1401062207
Hi @JayjeetAtGithub
```shell
alamb@MacBook-Pro-8 arrow-rs % git fetch apache
git fetch apache
remote: Enumerating objects: 11, done.
remote: Counting objects: 100% (11/11), done.
remote: Compressing objects: 100% (9/9), done.
remote: Total 11 (delta 3), reused 2 (delta 2), pack-reused 0
Unpacking objects: 100% (11/11), 8.37 KiB | 779.00 KiB/s, done.
From github.com:apache/arrow-rs
de381ec54..b826657ac master -> apache/master
alamb@MacBook-Pro-8 arrow-rs % git merge apache/master
git merge apache/master
Auto-merging arrow-cast/src/display.rs
Auto-merging arrow-csv/src/writer.rs
CONFLICT (content): Merge conflict in arrow-csv/src/writer.rs
Automatic merge failed; fix conflicts and then commit the result.
```
I believe the logical conflict came from
https://github.com/apache/arrow-rs/commit/24e5daef3248c38a6fb354c8427c9ba653e2b3e9
/ https://github.com/apache/arrow-rs/pull/3570
Your changes may actually supercede the changes in
https://github.com/apache/arrow-rs/pull/3570 but I would need to study it more
carefully
--
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]
