michaelsembwever commented on code in PR #133: URL: https://github.com/apache/cassandra-sidecar/pull/133#discussion_r1729549638
########## .asf.yaml: ########## @@ -0,0 +1,37 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +notifications: + commits: [email protected] + issues: [email protected] + pullrequests: [email protected] + jira_options: link worklog + +github: + description: "Sidecar for Apache Cassandra®" + homepage: https://cassandra.apache.org/ + enabled_merge_buttons: + squash: false Review Comment: > I do not think "required_linear_history" is necessary, as long as the "merge" option is disabled. With "squash" enabled (which is what you want), without "required_linear_history" you run the risk still (IIUC) of introducing erroneous merge commits when there's a race. > if this project ever gets multiple branches, the merge commit is wanted for merges across branches. you cannot do our "only merge commits for tracking between the mainlines" practice. what you would be introducing is erroneous merge commits for every commit from every PR. this creates rather unpleasant (IMHO) trees in the git history, rather than the much simpler and clean fast-forwarded tree (where the only branches correlate to each mainline). to have linear history and only-tracking-merge commits, and permit both command line and github approaches, is difficult. see https://github.com/michaelsembwever/atomic-linear-history-with-forward-merges-enforced-repo-demo and of course, atomically committing to multiple branches (which is kinda a safety requirement to the above example), can only be done form the command line. long story short, if you have multiple mainlines and want fast-forward tracking stick with the command line. (mainlines are your "multiple branches") -- 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]
