New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
skypeforlinux: caution against updates to unstable versions #32684
Conversation
Upstream publishes |
Rebased to master in 9045920. Thanks a lot for the clarification! |
Thank you!
Why could not you merge the PR? |
I typically avoid doing merges for small PRs to help keep the history somewhat clean. |
Please prefer to (1) merge the PR on GitHub, or else (2) rebase the whole PR onto the target branch before merging it on GitHub, or else (3) include the PR number in the commit message, because otherwise it is difficult to find the PR that introduced an interesting commit when you need additional context or want to discuss the change, GitHub UI does not display it as merged, the branch is not deleted when you delete all your merged branches. (git-whence makes it simple to find the PR of any merged commit.) Your effort to keep the history linear is dwarfed by merges of unrebased PRs and does not benefit any workflow that I know of. |
A commit (message) should provide context on its own. If needing access to the PR to understand why a commit is made, something is wrong, IMHO. |
Disclaimer: I consider git to hold the project history, much more than GitHub. |
Even if commits contained the complete context at the time they were made, they would tell nothing about what was discussed and became known after they were made.
Having access to the PR is useful for other reasons. Apart from being the best place for review, it tells what options were considered and what were not, who is interested or knowledgeable in the subject, etc. |
For discussion on the final commit (afterwards), you can comment directly on the commit object in github: If you want to lookup the PR to see the pre-commit discussion, type the commit id in the PR search field. (Assuming the committer posted the final commit id into the PR.)
For big PRs, yes. For small/trivial PRs, I personally don't think the merge commit adds much value. (One merge commit for one (real) commit is noise to me.) |
Motivation for this change
#32604 (comment)