dongjoon-hyun commented on PR #53344:
URL: https://github.com/apache/spark/pull/53344#issuecomment-3639911794

   Merged to master.
   
   Could you make a backporting PR, @davidm-db and @cloud-fan ? There exist 
conflicts in `branch-4.1`.
   
   ```
   $ git status
   On branch PR_TOOL_PICK_PR_53344_BRANCH-4.1
   You are currently cherry-picking commit 18a9435f28e.
     (fix conflicts and run "git cherry-pick --continue")
     (use "git cherry-pick --skip" to skip this patch)
     (use "git cherry-pick --abort" to cancel the cherry-pick operation)
   
   Changes to be committed:
        modified:   common/utils/src/main/resources/error/error-conditions.json
        modified:   
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/CatalystTypeConverters.scala
        modified:   
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Cast.scala
        modified:   
sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala
        modified:   
sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
        modified:   
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/DataSourceUtils.scala
        modified:   sql/gen-sql-functions-docs.py
   
   Unmerged paths:
     (use "git add <file>..." to mark resolution)
        both modified:   
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/timeExpressions.scala
        both modified:   
sql/connect/server/src/main/scala/org/apache/spark/sql/connect/execution/SparkConnectPlanExecution.scala
   ```


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


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to