Skip to main content
Sikora_Mateusz_Warsaw
Sikora_Mateusz_Warsaw
January 26, 2023
Question

Branch not merging

  • January 26, 2023
  • 11 replies
  • 1351 views

Hi,
I just noticed an issue with merging a branch to main file.
I am trying to merge as usual, the main file updates for few moments but after that if reloads back to the state before merging. The branch is not taged and not archived.

I tried to create merge branch on another file and new branch on the same file and both merged with out a problem.

So not sure if this is a problem with size of the file or branch, some conflicts (none pops up), or with whatever else. Anyone had similar issue or know the solution?

Thanks in advance,
Cheers,

    This topic has been closed for replies.

    11 replies

    Show previous replies
    Eric_Muller
    Eric_Muller
    New Member
    July 10, 2025

    I also just stumbled across this.

    I resolved all merging conflicts, now Figma is stuck on “Saving file” when trying to close it, it prevents me with this dialogue: “Hang tight! Still merging...” I can only confirm this. It’s been stuck over an hour now, for not that many changes in a rather small file.

    Luckily no one else worked on the main branch and I can just try to force quit and then manually copy and paste my changes into the main branch. 

    Will probably have to do this after lunch.

    Terms & ConditionsAccessibility statement