[
https://issues.apache.org/jira/browse/PIG-4820?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15178131#comment-15178131
]
Xuefu Zhang commented on PIG-4820:
----------------------------------
Hi [~pallavi.rao], to preserve the history, I need to use "svn merge". For
that, I need from you a patch that contains only the changes to resolve the
conflicts. Is that possible? Thanks.
> Merge trunk[3] into spark branch
> --------------------------------
>
> Key: PIG-4820
> URL: https://issues.apache.org/jira/browse/PIG-4820
> Project: Pig
> Issue Type: Sub-task
> Components: spark
> Reporter: Pallavi Rao
> Assignee: Pallavi Rao
> Labels: spork
> Fix For: spark-branch
>
> Attachments: PIG-4820.patch
>
>
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)