Resolving conflicts is nearly impossible, can I nuke Development and replace?

[dapphero]

I’m trying to merge a new version into development. I have quite a few conflicts, which are to be expected.

HOWEVER

Merging the conflicts can take many seconds per conflict sometimes a minute! There is no “Merge all” button, and the list feels infinite. It seems impossible to actually deploy a new app!

What should I do?

[dapphero]

Some of these conflicts don’t even have names, how am I supposed to even compare?

[eve]

Hello!

Our team is working on improvements to the multiversion system. Can you please file a bug report if you have not already done so, so that our team can accurately log this behavior?

Thanks in advance!

[dapphero]

I found a hack to make this process a tiny bit less painful. Using the developer console I enlarge the length of the conflict list so I can select far more items at once than waiting for the UI to update, scrolling down another couple items, and then doing the process again.