itholic commented on PR #39952: URL: https://github.com/apache/spark/pull/39952#issuecomment-1613568675
Could you rebase this PR to master? It seems like there are some conflicts from master and yours. https://github.com/G-Research/spark/runs/13927060744 ``` From https://github.com/G-Research/spark * branch branch-pyspark-map-in-pandas-schema-mismatch -> FETCH_HEAD Auto-merging python/pyspark/pandas/frame.py Auto-merging python/pyspark/sql/pandas/serializers.py Auto-merging python/pyspark/sql/tests/pandas/test_pandas_cogrouped_map.py Auto-merging python/pyspark/sql/tests/pandas/test_pandas_grouped_map.py Auto-merging python/pyspark/sql/tests/pandas/test_pandas_map.py CONFLICT (content): Merge conflict in python/pyspark/sql/tests/pandas/test_pandas_map.py Auto-merging python/pyspark/sql/tests/test_arrow_map.py Squash commit -- not updating HEAD Automatic merge failed; fix conflicts and then commit the result. Error: Process completed with exit code 1. ``` -- 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]
