Figma Support Forum

Error 500 when trying to merge branches

I am trying to merge my branch into master but while the blank diff screen is loading I get the following red message “An error occurred”. Checking the console I see there’s a status 500 while trying to load the results.

Hi Nelson!

Engineer on branching here. Is the error persisting? If so, please privately message the file key/URL to me and we can dive deeper.

Thank you for your patience!

I have the same error and persisted for some time. Any idea, @Alex_Xu?

Hi Dararith!

I will follow up with you privately.

Thanks for your patience!