↕️ 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)

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)

💭 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