You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@daffodil.apache.org by GitBox <gi...@apache.org> on 2021/05/05 11:23:19 UTC
[GitHub] [daffodil-vscode] stevedlawrence opened a new pull request #1: Add LICENSE/NOTICE/asf.yml files
stevedlawrence opened a new pull request #1:
URL: https://github.com/apache/daffodil-vscode/pull/1
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [daffodil-vscode] stevedlawrence commented on a change in pull request #1: Add LICENSE/NOTICE/asf.yml files
Posted by GitBox <gi...@apache.org>.
stevedlawrence commented on a change in pull request #1:
URL: https://github.com/apache/daffodil-vscode/pull/1#discussion_r626548492
##########
File path: .asf.yaml
##########
@@ -0,0 +1,30 @@
+# 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.
+
+github:
+ description: "Apache Daffodil VSCode"
+ homepage: https://daffodil.apache.org/
+ features:
+ wiki: false
+ issues: false
+ projects: false
+ enabled_merge_buttons:
+ squash: false
+ merge: false
+ rebase: true
Review comment:
The main reason I don't like the squash merge is because last I checked, it creates a merge commit if the PR isn't directly on top master. I try to avoid merge commits as much as possible.
My other issue with squash is that whoever created the PR probably has a better idea what a good squashed commit message should be, rather than whoever happens to be merging the PR. I'd rather the author fixup the message first, and the the merger doesn't have to do anything.
So it's not so much about forcing others to learn the workflow, but more I like to avoid merge commits, and the author of the commit knows best what a squash commit should be, rather than the merger.
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [daffodil-vscode] tuxji commented on a change in pull request #1: Add LICENSE/NOTICE/asf.yml files
Posted by GitBox <gi...@apache.org>.
tuxji commented on a change in pull request #1:
URL: https://github.com/apache/daffodil-vscode/pull/1#discussion_r626538309
##########
File path: .asf.yaml
##########
@@ -0,0 +1,30 @@
+# 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.
+
+github:
+ description: "Apache Daffodil VSCode"
+ homepage: https://daffodil.apache.org/
+ features:
+ wiki: false
+ issues: false
+ projects: false
+ enabled_merge_buttons:
+ squash: false
+ merge: false
+ rebase: true
Review comment:
Let me ask a question. I've tried the squash button on another repository and it works as well as you would expect. GitHub squashes the commits and shows you a new commit message composed from the original commit messages so you can edit the squashed commit message too. Since we want commits squashed when there are multiple commits, why do we enable the rebase button instead of enabling the squash button? I would think you'd still have the ability to do a manual rebase/squash in your checkout and force push the squashed commit with either button, but the squash button allows that manual step to be skipped if all you need to do in your next step to edit the squashed commit's message before merging the squashed commit. However, I know two good reasons for the manual step might be that if we made the squash too easy, a developer 1) might not develop the necessary skills, or 2) might forget to edit the composed message, meaning that the squashed commit's message still might
have all the original commits' messages in it. Is your thinking that the squash step should remain manual in order to ensure one's skills are well developed and one edits the message more carefully?
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [daffodil-vscode] stevedlawrence merged pull request #1: Add LICENSE/NOTICE/asf.yml files
Posted by GitBox <gi...@apache.org>.
stevedlawrence merged pull request #1:
URL: https://github.com/apache/daffodil-vscode/pull/1
--
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org