Replies: 3 comments 2 replies
-
This may not be very important, but as far as I know when doing a squash commit the author of the code is the person who clicks the merge button. Therefore, the original author's contribution will not be noted in the change history. I can imagine someone being upset about that. |
Beta Was this translation helpful? Give feedback.
-
The goal is to avoid consecutive commits of "wip" or "fix", and instead have a concise commit message of "Added X". Secondly, we're not aiming to squash into a single commit, we're just aiming for logical commits. A PR for a large feature may require multiple commits, but we don't need 5 commits for 5 lines changed in a single PR. Also, as @KyrietS mentioned, the author information is mangled - the issue you link is still open with issues around the author information. Secondly, according to the GitHub docs here there is no merge commit when you squash and merge but maybe there is and they're just being vague about what happens? Regardless, I believe we would still like that merge commit to exist. While I agree that people not knowing how to do certain things in git does pose an issue, I don't think changing how we expect PRs to be done is the right path forward. Failing people finding the answer on Google, perhaps an example git command could be provided or a guide could be linked? |
Beta Was this translation helpful? Give feedback.
-
You ask it even for relevant (IMHO) commit messages :-) I just wanted to highlight an alternative to simplify the process. I consider my proposal/question answered. |
Beta Was this translation helpful? Give feedback.
-
Not sure why you want squashing,
but instead of requiring to do it manually/individually in PR (which is error prone (#1773 closed accidentally), and make incremental review not possible),
it seems that it can be done automatically with merge button with some settings (https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests).
Beta Was this translation helpful? Give feedback.
All reactions