[BUG] Backports onto 2.x often run into conflicts #3090
Description
What is the bug?
We are having to manually resolve conflicts when attempting to backport changes from main into 2.x
How can one reproduce the bug?
- Try to backport a change from main into core, such as Bump JSON libs #2926
- Wait on the pull request
- See backport failed message
What is the expected behavior?
Conflicts should only occur when there is a significant difference - there are many changes that have not been backported that are causing conflicts
Do you have any additional context?
Seems like this is due to some large backports into 2.x that did not use the automated tooling and we've got changes that never made it into the 2.x branch