I keep on getting the following error when i try to update my branch and when i look at the status page - everything seems to be fine….
I am completely blocked - any suggestions how to fix this?

I keep on getting the following error when i try to update my branch and when i look at the status page - everything seems to be fine….
I am completely blocked - any suggestions how to fix this?
Hey
Just to verify: are you still getting this error message? If so, I’d first recommend this help page if you haven’t done so already: https://help.figma.com/hc/en-us/articles/5691750511383-Incomplete-merges-or-updates
There are some instances where merges can go wrong, and that page has some recommendations on what to try if that happens.
If you are still seeing this error, let me know.
Enter your E-mail address. We'll send you an e-mail with instructions to reset your password.