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

   Heads up — tried a master rebase on this branch as part of a maintenance 
sweep and hit 4 semantic conflicts in the @dnd-kit migration files 
(`DndSelectLabel.tsx`, `OptionControls/index.tsx`, 
`DatasourcePanelDragOption/index.tsx`, `ExploreContainer/index.tsx`). These are 
the kind of conflicts where master kept evolving with the old `react-dnd` API 
while this branch is replacing it, so they need migration-aware resolution 
rather than a mechanical merge. Leaving for the next time you're swinging 
through this PR.


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