You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@spark.apache.org by Meihua Wu <ro...@gmail.com> on 2015/07/28 22:46:48 UTC
Rebase and Squash Commits to Revise PR?
I am planning to update my PR to incorporate comments from reviewers.
Do I need to rebase/squash the commits into a single one?
Thanks!
-MW
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@spark.apache.org
For additional commands, e-mail: dev-help@spark.apache.org
Re: Rebase and Squash Commits to Revise PR?
Posted by Meihua Wu <ro...@gmail.com>.
Thanks Sean. Very helpful!
On Tue, Jul 28, 2015 at 1:49 PM, Sean Owen <so...@cloudera.com> wrote:
> You only need to rebase if your branch/PR now conflicts with master.
> you don't need to squash since the merge script will do that in the
> end for you. You can squash commits and force-push if you think it
> would help clean up your intent, but, often it's clearer to leave the
> review and commit history of your branch since the review comments go
> along with it.
>
> On Tue, Jul 28, 2015 at 9:46 PM, Meihua Wu <ro...@gmail.com> wrote:
>> I am planning to update my PR to incorporate comments from reviewers.
>> Do I need to rebase/squash the commits into a single one?
>>
>> Thanks!
>>
>> -MW
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@spark.apache.org
>> For additional commands, e-mail: dev-help@spark.apache.org
>>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@spark.apache.org
For additional commands, e-mail: dev-help@spark.apache.org
Re: Rebase and Squash Commits to Revise PR?
Posted by Sean Owen <so...@cloudera.com>.
You only need to rebase if your branch/PR now conflicts with master.
you don't need to squash since the merge script will do that in the
end for you. You can squash commits and force-push if you think it
would help clean up your intent, but, often it's clearer to leave the
review and commit history of your branch since the review comments go
along with it.
On Tue, Jul 28, 2015 at 9:46 PM, Meihua Wu <ro...@gmail.com> wrote:
> I am planning to update my PR to incorporate comments from reviewers.
> Do I need to rebase/squash the commits into a single one?
>
> Thanks!
>
> -MW
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@spark.apache.org
> For additional commands, e-mail: dev-help@spark.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@spark.apache.org
For additional commands, e-mail: dev-help@spark.apache.org