zeroshade commented on PR #1114:
URL: https://github.com/apache/arrow-go/pull/1114#issuecomment-5243278562

   @fallintoplace Heads-up: 
[#1106](https://github.com/apache/arrow-go/pull/1106) has just been merged into 
`main`. It touches the same `arrow/scalar/` code as this PR, so GitHub now 
reports this branch as conflicting.
   
   Nothing is wrong with this PR — it is still approved. It just needs a rebase 
onto the latest `main` to resolve the overlap, and then it can go in.
   
   Apologies for the extra round-trip: the conflict is a side effect of the 
sibling fix landing first, not anything you did.
   
   ---
   
   _Note: This comment was drafted by an AI-assisted triage tool run by a 
maintainer, and may contain mistakes. Once you have addressed the points above, 
an Apache Arrow Go maintainer — a real person — will take the next look at your 
PR. If anything here looks wrong, say so on the PR and a maintainer will follow 
up. See 
[CONTRIBUTING.md](https://github.com/apache/arrow-go/blob/main/CONTRIBUTING.md) 
for the project's contribution conventions._


-- 
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]

Reply via email to