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:
- From the branch, I click the dropdown arrow next to the branch name.
- Select the option to merge
- I resolve all conflicts
- 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…