spark-reviews mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dongjoon-hyun <...@git.apache.org>
Subject [GitHub] spark pull request: [SPARK-14878][SQL] Trim characters string func...
Date Mon, 25 Apr 2016 17:20:57 GMT
Github user dongjoon-hyun commented on the pull request:

    https://github.com/apache/spark/pull/12646#issuecomment-214448521
  
    Oh, by the way, Github shows no confilicts but it seems to fail to rebase to the master.
    It might cause some delay when merging. I'm not sure, but you had better check on your
local machine.
    ```
    spark:PR-12646$ git rebase master
    First, rewinding head to replay your work on top of it...
    Applying: draft of seq[expression]
    Using index info to reconstruct a base tree...
    ...
    CONFLICT (content): Merge conflict in sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala
    Auto-merging sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4
    CONFLICT (content): Merge conflict in sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4
    error: Failed to merge in the changes.
    Patch failed at 0001 draft of seq[expression]
    The copy of the patch that failed is found in: .git/rebase-apply/patch
    ...
    ```


---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org


Mime
View raw message