aminghadersohi commented on PR #44283: URL: https://github.com/apache/superset/pull/44283#issuecomment-5675991165
I reproduced the master migration conflict at `ae240a8e6f0332acb709943d0884eae73927c9de`: `c7f53d184ea2` and `88a01c781622`. This PR already joins those exact heads, so it overlaps the baseline repair being investigated for the startup/integration failures on #44285, #44286 and #44287. @eschutho Would you be comfortable separating the baseline repair into a minimal no-op merge revision, with this migration then rebased/reparented to that revision? That would unblock master without coupling the repair to the ClickHouse data rewrite. Neither migration should land unchanged alongside an independent merge of the same parents: that would leave two heads again. No changes have been made to this PR or the driver PRs. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
