Update to workspace head revision with conflict resolution

[MauricioUyaguari]

Summary

handle updating when current revision not in sync with workspace head
Closes #756

How did you test this change?

• Test(s) added
• Manual testing (please provide screenshots/recordings)
• No testing (please provide an explanation)

No Conflict

Screen.Recording.2022-02-08.at.10.02.58.PM.mov

Conflict

Screen.Recording.2022-02-08.at.10.04.41.PM.mov

Force Update

Screen.Recording.2022-02-08.at.10.14.50.PM.mov

[changeset-bot]

🦋 Changeset detected

Latest commit: 0987dc0

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 26 packages

Name	Type
@finos/legend-studio	Minor
@finos/legend-art	Patch
@finos/legend-graph	Patch
@finos/legend-model-storage	Patch
@finos/legend-server-sdlc	Patch
@finos/legend-extension-dsl-data-space	Patch
@finos/legend-extension-dsl-diagram	Patch
@finos/legend-extension-dsl-serializer	Patch
@finos/legend-extension-dsl-text	Patch
@finos/legend-extension-external-language-morphir	Patch
@finos/legend-extension-external-store-service	Patch
@finos/legend-studio-app	Patch
@finos/legend-studio-extension-management-toolkit	Patch
@finos/legend-studio-extension-query-builder	Patch
@finos/legend-application	Patch
@finos/legend-manual-tests	Patch
@finos/legend-query-app	Patch
@finos/legend-query	Patch
@finos/legend-taxonomy-app	Patch
@finos/legend-taxonomy	Patch
@finos/legend-extension-external-format-json-schema	Patch
@finos/legend-server-depot	Patch
@finos/legend-graph-extension-collection	Patch
@finos/legend-studio-deployment	Patch
@finos/legend-query-deployment	Patch
@finos/legend-taxonomy-deployment	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

[codecov]

Codecov Report

Merging #749 (0987dc0) into master (b8ee413) will decrease coverage by 0.29%.
The diff coverage is 18.67%.

@@            Coverage Diff             @@
##           master     #749      +/-   ##
==========================================
- Coverage   42.88%   42.59%   -0.30%     
==========================================
  Files         935      938       +3     
  Lines       41617    42073     +456     
  Branches     9591     9708     +117     
==========================================
+ Hits        17849    17921      +72     
- Misses      23694    24078     +384     
  Partials       74       74              

Impacted Files	Coverage Δ
...graph/src/graphManager/AbstractPureGraphManager.ts	100.00% <ø> (ø)
...rc/models/protocols/pure/v1/V1_PureGraphManager.ts	59.62% <0.00%> (-0.35%)	⬇️
...ackages/legend-server-sdlc/src/SDLCServerClient.ts	0.50% <0.00%> (ø)
...dio/src/components/editor/edit-panel/EditPanel.tsx	59.23% <0.00%> (ø)
...io/src/components/editor/side-bar/LocalChanges.tsx	5.95% <0.00%> (-3.31%)	⬇️
...-studio/src/components/editor/side-bar/SideBar.tsx	33.33% <0.00%> (ø)
...egend-studio/src/components/review/ReviewPanel.tsx	14.28% <ø> (ø)
packages/legend-studio/src/stores/EditorConfig.ts	100.00% <ø> (ø)
packages/legend-studio/src/stores/ReviewStore.ts	0.00% <0.00%> (ø)
packages/legend-studio/src/stores/ViewerStore.ts	12.14% <0.00%> (ø)
... and 28 more

[akphi]

@MauricioUyaguari you should rebase to dismiss the Whitesource warning.

[akphi]

Left some minor comments: mostly has to do with the the decomsition of the term syncing workspace to push local changes and pull remote changes. The PR is massive and I don't have the best focus now so please do me a favor and be exhaustive in this process. Thanks!

[MauricioUyaguari]

Left some minor comments: mostly has to do with the the decomsition of the term syncing workspace to push local changes and pull remote changes. The PR is massive and I don't have the best focus now so please do me a favor and be exhaustive in this process. Thanks!

@akphi
The agreed terminology (correct me if I'm wrong).
In terms of actions, we will use
pull/push changes
Pull changes refers to pulling in remote workspace changes.
Push changes refers to pushing local changes.

We will keep out-of-sync to describe the state of local and remote workspace being out-of-sync.
We will also keep the term outdated to describe when the workspace is outdated from the project master.
Good?

[akphi]

So besides minor phrasing changes, I think for names of the stores, we should do WorkspaceSync...State because that state controls the logic for both direction push and pull.