Hello community,

I am looking for any information on how working with branches and merging branches has been for you guys. I am currently working with a file that should serve as a single source of truth for other files. It is a design system file with variables and a hierarchy of namings for the variables.

We are considering restructuring some of the variable groups and how the group namings are set up. We might group variables into a functionality structure where components that are usually used for input & controls are grouped together, then components that are for content & display are in another group, then components that are usually for navigation are in another group, feedback & status group, layout & structure group, and then maybe an overlays group.

We might also regroup typography variables like fontsize, weight, and family into a nested group structure. Some of our variables have generic semantic names and then some have a more specific component level name.

We have set up a playgroud branch which is meant for experimentation and learning.

Has anyone worked with branching and merging of files that contain grouped variables then those groups are restructed in the branch. Are there any merge issues that can happen? What is the review of the merge process like?

Thank you for your time and any feedback.