Right now, the “Update from main file” modal is the least helpful modal imaginable:
No indication of what or where the conflict is. All I see is a zoomed-out view of my “Layout & Content” library page with nothing highlighted or listed out anywhere. And with this information, I have to choose whether to keep these changes or keep my branch. I manage a design system for a team of 10 designers, split up into 3 pods. This is a nightmare every time.
Items with changes should be highlighted, and those changes should also be listed on the left-hand side.
Edit: And would you look at that, I chose to keep the branch, arbitrarily, and the next screen actually shows me what the update involves! Why wouldn’t this be on the first screen? (I’ve edited out the content for NDA reasons) Now I actually have to go back to the previous screen and choose again if I’ve made a mistake.
