I love the branch/merge feature however I am constantly updating in main when I am intending to update in the branch I opened.

The update from main feature is nice, however it’s stressful to have to choose which-update from-which-branch I want when I didn’t want to make updates in main in the first place. I’ve even selected the wrong update and lost work a few times now.

I would love if Figma could add something in the working area of the main file that was more obvious upon opening a branch. Something like a bar across the top of the screen that said “Main file: Branch xxxx currently open”.