Github user srowen commented on a diff in the pull request:
https://github.com/apache/spark/pull/12469#discussion_r60726935
--- Diff: sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveUtils.scala
---
@@ -80,10 +80,8 @@ class HiveContext private[hive](
protected[sql] override def sharedState: HiveSharedState = {
sparkSession.sharedState.asInstanceOf[HiveSharedState]
}
-
--- End diff --
Hm, how would it resolve the conflict if it shows as a diff vs master now?
this means the line was present in master.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
