feat/refactor: add merge api #5259
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aryairani
reviewed
Aug 9, 2024
| @@ -818,7 +820,7 @@ project/alice> merge /bob | |||
| type Foo = Baz Nat Nat | Qux Text | |||
|
|
|||
| -- project/bob | |||
| type Foo = Baz Nat | BobQux Text | |||
| type Foo = BobQux Text | Baz Nat | |||
There was a problem hiding this comment.
Any idea what caused these to flip?
There was a problem hiding this comment.
Not exactly, but I did investigate and they seem to have been wrong before. I manually walked through the transcript and observed that on project/bob (in this example) the constructors do render in the new order. 🤷
There was a problem hiding this comment.
Updated explanation: in this PR we no longer reuse unique type UUID in merge, so any merge performed in a transcript can affect subsequent unique type constructor orders. We were going to circle back on that in a follow-up PR.
aryairani
approved these changes
Aug 13, 2024
aryairani
force-pushed
the
24-08-01-merge-api
branch
from
1fc2690 to
ed555a3
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
This PR refactors the merge API to make it more pure and suitable to call from Share.