Figma Support Forum

Bug: Conflicts but resolving broken on page renaming

Hi, I just discovered a bug with Update from main... and Resolve merge conflicts in combination with page renaming. Basically both functions break, making it impossible to merge a branch when you do the following:

Main: Page X
Branch: Page X → Rename to Page Y → New Page with name Page X

This basically creates a Merge Conflict, but Figma is unable to properly handle this.

The temporary fix is to rename Page X in main to Page Y.

Hi Pim, sorry you hit this issue - just sent you a DM.