↕️ Git sync enhancements - push, pull, merge, branching

When a Git sync provider is connected to the plugin, there are a few requests from the community that would positively impact their workflow:

• When there are broken tokens that might have negative consequences to the connected code base, bring awareness to these tokens and provide options to self-solve.

  • Perhaps a setting that prohibits a push with broken tokens for projects with automated pipelines in place

• Explore alternate ways of dealing with merge conflicts

  • Today we can only pull from the branch currently selected and there isn't a way to merge the in the main branch

• Explore ways to improve a multi-collaborator workflow to ensure when one person pushes changes to a branch it does not over-write the second persons code.

  • A notification in the plugin that the Figma file is open elsewhere and the plugin is also open could be helpful

• Enhance the UI of the branch, and merge information being displayed

  • Today long branch names default to wrap the text display which can clutter the UI of the plugin (Github #2011)

• Bring back the support of Json5 files being uploaded (Github #2121)

We also have a known issue where the push/pull indicator persists in the plugin after the push has been completed. This leads designers to feel uncertain if the plugin is working correctly and they are afraid of loosing their work. (Github #2320)

• Only show Active GitHub branches and hide or filter stale branches

  • Can we make it so the branches menu is a lot more useful? Once you get to a certain point and number of branches it becomes difficult to navigate and find the branches you are working on. Can we add filters which GitHub has? Only show Active branches by default and hide stale branches.

• Support for the plugin to track user’s default remote branch separately from the locally created remote branches.

  • All changes to our design token library occur on separate branches in both Figma and on GitHub. This workflow often causes the plugin to display a missing credentials error after merges. This likely stems from the plugin retaining the feature branch in its configuration after it has been merged back into the main file. A more elegant handling of this case would be appreciated. It's not a major issue, but it is a minor nuisance whenever changes are made to the library.

UI and Affordances

• A search function inside of the branch list is helpful when there is a very long list of branches in the repository.

  • “It’s one click in git to copy a branch name and use that to find it in several tools”

• Folders within the branch list could also help with managing very long lists of branches.

  • “using folder/branchname to group branches in logic groups and giving the option to fold/unfold those would declutter massive repositories”

💭 How might we...

Reconsider the branch, push and pull features for folks connected to a Git sync provider to avoid potential problems with their tokens in code by self-solving.

💬 Feedback that is valuable

• What parts of collaborating with other people who share the same tokens is problematic or frustrating to you and your team?

• What other enhancements to the git process would benefit your workflow?

• How does this issue impact your day-to-day workflow?

• What workarounds do you have?

↔ Related topics

• 🧑‍💻 Sync to external token storage enhancements → Jump to post