When a Figma branch is updated from main, components modified on the branch can be replaced wholesale, even when the branch changes are additive or limited to layers or properties that do not overlap with changes from main. In a recent library-maintenance session using Claude and Figma skills, this caused branch-specific edits to be lost multiple times and required rerunning rebuild scripts after each update from main.
Request: allow incoming updates from main to be reviewed and applied at a finer granularity than the entire component. Ideally, non-conflicting changes could be preserved automatically, while actual conflicts are surfaced at the property or layer level with a choice to keep the main version or branch version. Even a simpler option to preserve branch changes where they do not conflict would be a meaningful improvement.
Use case: I maintain a Figma library that mirrors a shipped React design system. My branch often contains targeted changes, such as rebinding a token, renaming a variant, or restructuring auto layout, that are orthogonal to changes happening in main, but updating from main currently forces that work to be redone.