I have been using branching successfully to generate new components in a design system for a few months now. I make a branch for each new component, get it reviewed and then merge it into the Main branch once it’s approuved. As I have many branches and they are not approved&merged in to Main the order they were created I end up having to update the ongoing branches with changes from Main, again usually this is not an issue.
Lately I have noticed that when conflicts are detected they are all grouped into a single mega conflict. So I cannot select which components should be updated from Main and which ones should stay as designed in the branch rendering the entire process useless as it’s now an All Or Nothing merging process.
I can’t click on each element to select which branch to keep and the selection buttons are missing so what now?