Currently when reviewing changes, there’s a “resolve all” option that applies to all pages and all changes on each page. However, it would be really great to be able to resolve for all changes on a single page because I might have 2 pages that I made branch edits on, and 17 pages that should maintain the Main file edits. Currently you have to manually select for every change on every page, if you can’t resolve 100% for branch or for main. Which is crazy.
Going even a step further, within a page it would even be helpful to be able to select multiple changes and resolve those as a group, speeding up the 1x1 process but giving more fidelity than a “resolve all”.
In general I find the UI of the resolve and merge somewhat confusing, and the new designers on my team who are using branches for the first time have come to me with questions about how the heck this works, and for help to make sure they won’t mess anything up when merging. I think this speaks to the fact that it’s fairly hard to parse what you’re looking at when you’re learning this process (and even when you’re familiar with it, I’ve learned it but I don’t really get it).