Feature request: Support updating out of sync workspaces (including conflict resolution)

[MauricioUyaguari]

Similar requests

• I have searched and found no existing similar requests

How are you using Studio?

Legend Studio

What problems are you trying to solve?

Provide an interface to users to handle local conflicts in changes.
For now this can occur in two situations

• User current workspace revision is outdated with the head of workspace. Conflicts resulted in local changes vs base/head of workspace.
• User apply patches and conflicts results from patch changes and local changes.

Describe the solution you would like to see implemented

• Workspace conflict
  • Provide user notification when workspace is not in sync with head revision. i.e when saving, local change viewer
• Main Conflict Resolution
  • Compute the diff between the base revision and the current revision
  • Compute conflicts between the 2 sets of changes
  • Create an interface (similar to conflict resolution) to resolve the conflict, in the end, we end up with changes in the workspace. Bug detected Bug: Code Lens Commands not showing up in EntityChangeConflictEditor #814

Describe alternatives you have considered

No response

Documentation, Design, Adoption, Migration Strategy

No response

Contribution

• I would like to work on this feature

[akphi]

Discussed with the highly sought-after @MauricioUyaguari and the decision is to leave model loader out of this. Model loader operation is imperative and will override anything as well as do a hard reload on the graph, there's no safety, conflict check we would need to do, but if we do hard save like in #191, we would probably need to do some safety check.