Formed in 2009, the Archive Team (not to be confused with the archive.org Archive-It Team) is a rogue archivist collective dedicated to saving copies of rapidly dying or deleted websites for the sake of history and digital heritage. The group is 100% composed of volunteers and interested parties, and has expanded into a large amount of related projects for saving online and digital history.
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 notifications@github.com 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 <myles.borins@gmail.com> Reviewed-By: Stephen Belanger <admin@stephenbelanger.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
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 <myles.borins@gmail.com> Reviewed-By: Stephen Belanger <admin@stephenbelanger.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
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 <myles.borins@gmail.com> Reviewed-By: Stephen Belanger <admin@stephenbelanger.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
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 <myles.borins@gmail.com> Reviewed-By: Stephen Belanger <admin@stephenbelanger.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
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 <myles.borins@gmail.com> Reviewed-By: Stephen Belanger <admin@stephenbelanger.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
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 <myles.borins@gmail.com> Reviewed-By: Stephen Belanger <admin@stephenbelanger.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
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 <myles.borins@gmail.com> Reviewed-By: Stephen Belanger <admin@stephenbelanger.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
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: