sryza commented on code in PR #51080:
URL: https://github.com/apache/spark/pull/51080#discussion_r2125183732
##########
sql/pipelines/src/main/scala/org/apache/spark/sql/pipelines/graph/QueryOrigin.scala:
##########
@@ -22,6 +22,10 @@ import scala.util.control.{NonFatal, NoStackTrace}
import org.apache.spark.internal.Logging
import org.apache.spark.sql.catalyst.trees.Origin
import org.apache.spark.sql.pipelines.Language
+<<<<<<< HEAD
Review Comment:
Unresolved merge conflicts here
--
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]
