MaxGekk commented on PR #56853: URL: https://github.com/apache/spark/pull/56853#issuecomment-4854875101
Hi @jubins — the branch looks like it picked up a bad merge. The intended change here is the one-line `unix_micros` docstring addition (`Truncates higher levels of precision.`), but the current diff shows ~41 unrelated files across `network`, `columnar`, archive-reader suites, dynamic pruning, `cast.sql` golden files, pipelines, etc. The cause is the `Fix merge conflicts` merge commit (`5b36a73`): the branch was based on an older master (`dcde6956`, Jun 27) and merged in a since-stale master, so master's own recent changes surface as part of this PR's diff. Spark also prefers PRs without merge commits (the merge script cherry-picks commits). Could you clean up the branch so the diff is just the docstring change? Something like: ```bash git fetch upstream git checkout j-SPARK-57742-unix_micros-docstring git reset --hard 54cf5c8 # the docstring commit git rebase upstream/master # replay just that commit on current master git push --force-with-lease ``` Once the diff is back to the single-line change, I'll review it right away. Thanks! -- 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]
