Kevin Risden created KNOX-1764:
----------------------------------
Summary: 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
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)
