Skip to main content
Danh N Bui
Danh N Bui
New Member
March 2, 2026
Question

Solving Conflict Require Choosing Main/Branch For All Components

  • March 2, 2026
  • 1 reply
  • 90 views

I had a page “Components” to manage all my local components. There are some new updates in the main file that require me to resolve the conflicts. When updating, it allows me to choose only Main or Branch for ALL COMPONENTS. But some components I need to update from the main file, some I need the current changes in the branch.

 

 

    This topic has been closed for replies.

    1 reply

    KellyK
    KellyK
    Active Member
    March 4, 2026

    I have the same problem! It was already very difficult to resolve conflicts in that tiny context-less preview window, and now that we’re forced to pick all or nothing my open branches are basically unsalvageable. 😢

      Terms & ConditionsAccessibility statement