Merge only select elements

Forum|Forum|5 years ago
June 14, 2021
32 replies
5030 views

Maybe on confused on how the feature works. If the team is using for ideation and keeping the master branch clean for devs and clients. When it comes time to push elements from a branch to the master file, currently it pushes the entire branch. This is pointless. We don’t want all the ideation, all the options, all the throw away work, just the version that we moved forward with.

Currently we need to make a new branch we call “to be merged” and we need to copy just the artboards that are approved into the new branch then merge from there. This feels like to many steps and is complicated on a team of 4 designers. Shouldn’t there be an option to select just the artboards, components, styles, etc that we want to bring forward and leave all the other work in the archived branch incase we need to go back and grab something from it in the future?
Pushing everything makes the feature feel useless because you’re either deleting all your ideation or creating “merge” branches to make sure you don’t lose your work.

Branching and merging

Show previous replies

Uhl_TW

Ideally, this would allow us to choose which changes to merge (or not) at the frame level.

But even if it were at the page level, it’d still be a great help!

Dave_House1

Desperately need this, a lot of work is needed to clean each branch to have safe merges… even then you end up publishing changes from main that were unessasary.

Alain_Rousseau

It really should be like how Git works …

You do some changes in your branch. You stage the changes you want (meaning you select the things you want to send). Then you commit your changes and then merge it to the master branch.

Nils8

New Member

i want to highlight that request, as the branch/merge function is currently a nice addition but not useable for complex and big projects.

Parsley_James

Ditto all the above comments.
Improving the branch functionality is desperately needed!

S

Sam_Sullivan

Nudging this. Does Figma product team actually monitor the community forum?

The use cases and implementation are all lovely for a single designer with workflows where they work on a single ticket at a time, but thats not how most product/design teams work in the enterprise world. My team of 3 designers need to be able to generate multiple branches from the same main file, then merge back in once work as complete. The lack of any granularity in the diff makes that impossible, as they’d just overwrite each other.

The current implementation is more of a glorified versioning system. A ‘branch’ in this system is just giving the ability to name a version from version history (the current version), and compare that version side by side. It’s version history with naming and a diff modal.