GitHub user baibaichen added a comment to the discussion: [Discuss] Keep the 
commit history when adding a new spark version

> > My suggestion is for developers to use a merge commit locally to retain the 
> > history of all smaller individual commits.
> 
> This may be difficult to achieve as we usually amend fixes when addressing 
> the review/comments. Using a single commit can keep the git log much cleaner 
> and People can always to lookup the changes in GH pull requests

I agree. Let's follow the Iceberg approach:

1. **Move** files from the old Spark version to the new one.
2. **Copy** them back from the new version to the old.
3. **Apply** necessary modifications for the new version in a single commit.

So,  
- For PRs supporting new Spark versions, use **rebase**.  
- For other PRs, use **squash**.

If there are no objections, I’ll create a PR to enable rebase.

GitHub link: 
https://github.com/apache/incubator-gluten/discussions/11352#discussioncomment-15410563

----
This is an automatically sent email for [email protected].
To unsubscribe, please send an email to: [email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to