Merging the 6.12.0 release into master #4223
Merged
Conversation
This file contains hidden or 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
google-oss-bot
added
api: firestore
zip-builder
paulb777
reviewed
Nov 5, 2019
|
When there are non-trivial cherry-picks, I've found that it's cleaner to make a branch from master and manually merge (and resolve any conflicts) from the release branch before sending the merge-back PR. Otherwise github will add a bunch of changes already in master to the PR. |
|
The only Travis failure is now is Messaging which is still failing in master |
paulb777
approved these changes
Nov 6, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
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.
No description provided.