M23 rebase #970
Closed
M23 rebase #970
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
jezdez
suggested changes
Jun 28, 2019
There was a problem hiding this comment.
There are some extension things that we fixed in the later stage of m22 (eg. using redash.extensions for the bundles, while the new name of the entrypoint s redash.bundles). I'm worried that you reused rebase merge resolutions from your m22 rebase and that there are more things that I actually fixed again in m22. Please compare m22 and m23 again.
Also, could you please squash the schema drawer rebase commits, and other related commits, like 25adf75 and 26b4ca5?
|
I didn't see that |
washort
force-pushed
the
master
branch
2 times, most recently
from
e75b143 to
898ac22
Compare
|
this is on master now. |
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.
Upstream changes were fairly minor this round, only thing of note was the getredash#3291 schema viewer stuff conflicting with ed2ac40