Ensure a merge commit exists so that we can diff both sides of it. #3009
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
|
Hi! I'm the modular magician, I work on Magic Modules. Pull request statusesNo diff detected in terraform-provider-google-beta. New Pull RequestsI didn't open any new pull requests because of this PR. |
danawillow
approved these changes
Jan 22, 2020
merge could instead be resolved as a fast-forward.
modular-magician
force-pushed
the
magician-v2-fixes
branch
from
8a39c29 to
94143f2
Compare
nathkn
pushed a commit
to nathkn/magic-modules
that referenced
this pull request
May 18, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
"With --no-ff, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward."
Release Note Template for Downstream PRs (will be copied)