You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@knox.apache.org by "Sandor Molnar (JIRA)" <ji...@apache.org> on 2019/02/15 08:20:00 UTC
[jira] [Commented] (KNOX-1764) Ensure that only squash/rebase/merge
commits are allowed from Github UI
[ https://issues.apache.org/jira/browse/KNOX-1764?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16769063#comment-16769063 ]
Sandor Molnar commented on KNOX-1764:
-------------------------------------
After reading the above-referenced e-mail thread I wanted to start a discussion thread on our user mailing list to decide if we want to use squash or rebase in Github going forward. However, I found out that it's not true that squash commits overwrite the author in Git's history. Given that this was the only drawback of this option I shared my opinion with [~krisden] and we both agreed that we should use the {{Squash and merge}} option going forward.
Sample PR: [https://github.com/apache/knox/pull/51] has been created by smolnar82 (smolnar@apache.org) and has been merged by risdenk (krisden@apache.org). As you can see Github did not alter the Git history:
{noformat}
commit bc01baf8a25230424060f247329cc7fbbaf3925f (HEAD -> master, upstream/master)
Author: Sandor Molnar <sm...@apache.org>
Date: Thu Feb 14 15:57:00 2019 +0100
KNOX-1760 - Created Pull Request template (#51)
{noformat}
I already created the corresponding INFRA JIRA: https://issues.apache.org/jira/browse/INFRA-17857
> Ensure that only squash/rebase/merge commits are allowed from Github UI
> -----------------------------------------------------------------------
>
> Key: KNOX-1764
> URL: https://issues.apache.org/jira/browse/KNOX-1764
> Project: Apache Knox
> Issue Type: Sub-task
> Reporter: Kevin Risden
> Assignee: Sandor Molnar
> Priority: Major
> Fix For: 1.3.0
>
>
> There was a really good discussion about the nuances of the different button behaviors in Calcite here: [http://mail-archives.apache.org/mod_mbox/calcite-dev/201901.mbox/%3C47e904ba-978f-f74f-eef9-59f1d90cd295%40apache.org%3E]
>
> Summary:
> * Merge commits - don't have linear history like our existing history primarily is
> * Squash commits - don't keep the original PR as author. Only has attribution to the user who hit the Squash button
> * Rebase commits - Keep linear history and author history. Need to be careful to make sure the commits are squashed by PR author prior to committing to avoid a lot of small commits.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)