-
Notifications
You must be signed in to change notification settings - Fork 29.6k
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
doc: explain why we don't use the GitHub merge button #8893
Comments
the latest rebase feature changes the author the old rebase and merge feature adds meta data to the commit title the original merge method adds a merge commit On Sun, Oct 2, 2016, 1:53 AM Rich Trott [email protected] wrote:
|
Squash/merge does that by default, but isn't it possible to modify the commit message while merging? |
@not-an-aardvark I've personally experienced it adding the meta data without an obvious way to avoid it. At the very least it is error prone enough that I do not believe the pain is worth the benefit |
yep, I dealt with that last week while cutting v6.7.0. I would say that @thealphanerd's comment (#8893 (comment)) describes it pretty well. |
Yeah, what @thealphanerd said. |
(All of which make viewing commits / tooling / attribution / etc more difficult.) |
Have we documented anywhere why we add |
It's like |
It also gives a list of people to @mention / contact when something goes wrong, and doesn’t require the assumption that Github lasts forever for that ;) |
We generally don't use Github merge button when we don't want the changes in our branch to be merged with the upstream branch ; for this we can also close the pull request without merging. |
Adds documentation and explicit reasons on why the GitHub web interface button is not used. This was explained in the referenced issue by @thealphanerd. Fixes: nodejs#8893
Hello everybody, I took a shot at this and have opened up a pull request. Hopefully some of you can review it and see if it closes this issue. Thank you :) |
Adds verbose reasons to the documentation on why the Reviewed-By metadata on a pull request is important. This was loosely mentioned as an issue in the referenced issue below, and answered by @addaleax. Ref: nodejs#8893 change wording on documentation update Changes the initial commit to the recommended, and more accurate wording. Removed time qualifiers on documentation for git merge removes the ugly wording add a new reason why autosquashing is prohibited
Adds verbose reasons to the documentation on why the Reviewed-By metadata on a pull request is important. This was loosely mentioned as an issue in the referenced issue below, and answered by @addaleax. Ref: #8893 PR-URL: #9044 Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Stephen Belanger <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
Adds documentation and explicit reasons on why the GitHub web interface button is not used. This was explained in the referenced issue by @thealphanerd. Fixes: #8893 PR-URL: #9044 Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Stephen Belanger <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
Adds verbose reasons to the documentation on why the Reviewed-By metadata on a pull request is important. This was loosely mentioned as an issue in the referenced issue below, and answered by @addaleax. Ref: #8893 PR-URL: #9044 Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Stephen Belanger <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
Adds documentation and explicit reasons on why the GitHub web interface button is not used. This was explained in the referenced issue by @thealphanerd. Fixes: #8893 PR-URL: #9044 Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Stephen Belanger <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
Adds verbose reasons to the documentation on why the Reviewed-By metadata on a pull request is important. This was loosely mentioned as an issue in the referenced issue below, and answered by @addaleax. Ref: #8893 PR-URL: #9044 Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Stephen Belanger <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
Adds documentation and explicit reasons on why the GitHub web interface button is not used. This was explained in the referenced issue by @thealphanerd. Fixes: #8893 PR-URL: #9044 Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Stephen Belanger <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
Adds verbose reasons to the documentation on why the Reviewed-By metadata on a pull request is important. This was loosely mentioned as an issue in the referenced issue below, and answered by @addaleax. Ref: #8893 PR-URL: #9044 Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Stephen Belanger <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
I get asked why we can't use the GitHub merge button at onboardings from time to time and I never know what issues with it are real and what I merely imagine.
onboarding.md currently says:
And that's it. One or two sentences explaining the deal-breaker incompatibilities with our workflow would be great. @cjihrig? Someone else?
The text was updated successfully, but these errors were encountered: