Skip to main content
Question

Changes not merging from branch into main - can do the merge, but changes aren't reflected in main.

  • July 28, 2025
  • 1 reply
  • 16 views

cdux

I am trying to do what seems like a pretty easy task: merging changes in a branch into the main file.

Here are my steps:

  1. From the branch, I click the dropdown arrow next to the branch name. 
  2. Select the option to merge
  3. I resolve all conflicts
  4. Complete the merge.

Expected result:

  • The changes from the branch should appear in the main file.

Actual result:

  • They don’t. Nothing happens. Main stays the same, branch stays the same.

On top of that, the Figma labeling is confusing. It’s either incorrect/copy errors that are confusing, or I am legitimately not doing this correctly.

For example, then the merge modal is up, the title of the modal reads “update from main file.” But that’s not what I’m doing, I selected to do the opposite AND the UI reflects I am doing the opposite: I am “merging branch” not “updating from the main file.”

 

This whole feature feels half baked, and in the meantime, I’m going to abandon it by simple copying all my changes from the branch into the main file, then archive the branch. But it would be nice to know if I was doing something wrong or not… 

djv
Figmate
  • Community Support
  • August 15, 2025

Hi ​@cdux, thanks for reaching out and apologies for the delayed reply! 

Are you still having issues with merging branches? 

From what you’ve described, it sounds like you’re doing things correctly. For more guidance with this, please reach out to our support team directly: https://help.figma.com/hc/en-us/requests/new

Be sure to use your Figma email address and provide the main file that you are trying to merge into, so our team can take a closer look. 



Cookie policy

We use cookies to enhance and personalize your experience. If you accept you agree to our full cookie policy. Learn more about our cookies.

 
Cookie settings