rusackas commented on PR #43571:
URL: https://github.com/apache/superset/pull/43571#issuecomment-5942963132

   Heads up, this now has a merge conflict with `master`: #44618 (bubble chart 
fix) just landed and both PRs insert a test at the same point in 
`tests/unit_tests/mcp_service/chart/test_chart_utils.py`, directly after 
`test_merge_chart_preserves_omitted_defaults`. @gabotorresruiz already flagged 
this as a heads-up a few days ago. Should be a straightforward "keep both" 
resolution on rebase. Approved otherwise, just can't merge until that's cleared.
   


-- 
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]

Reply via email to