I have a situation in my Swift iOS development project.

20 days ago, I created a branch named Modular_Approach from the Main-Branch. It’s an enterprise application, so it took quite a while to convert the entire codebase into modules. Now, with Swift Package Managers (SPMs) created, 80% of the files have been moved to different SPMs instead of being in one project.

During these 20 days, my team of 10 people made significant changes to the files that are now in the SPMs. I’m unsure how to proceed with merging the main branch into my Modular_Approach branch because 80% of the files have been relocated.

Can anyone suggest a smart solution for this situation?