This repository has been archived by the owner on Nov 16, 2022. It is now read-only.
just use merge commits in the security repo #505
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge commits are easier to do in GitHub and they're our normal practice. The only downside I see (specific to this situation--merge commits have their detractors in general) is that we end up with a commit comment in the main repo that points to a PR in the security repo. Meh.
Closed
|
Any objections @rohitpaulk @TheHmadQureshi et al.? |
|
What actually you are saying? Opening ticket here for every h1 report and then Merge commits ? and give reference on h1? is that what you are saying? |
|
No, this is about a somewhat obscure distinction between two methods of merging pull requests. |
|
Fundamentally we want to:
The proposal here is that we simply use GitHub's big green "Merge" button for step 1. |
|
Hearing no objections, and @rohitpaulk already having introduced this practice ... :-) |
chadwhitacre
added a commit
that referenced
this pull request
Feb 18, 2016
just use merge commits in the security repo
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge commits are easier to do in GitHub and they're our normal practice. The only downside I see (specific to this situation; merge commits have their detractors in general) is that we end up with a commit comment in the main repo that points to a PR in the security repo. Meh.