Figma Support Forum

Feature request: Ability to resolve conflicts without waiting for Figma to load screens

When reviewing larger files, and when you are perfectly aware of what files to keep from main & branch on beforehand, you should be able to resolve these without having to wait for Figma to load up the screens before you can click on either “Keep main” or “Keep branch”. For large files with up to 60+ conflicts in where you know only a small handful of frames needs to be merged, it is really time-consuming to go through all conflicts while waiting for every one of them to load before you can resolve them.