New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use easier way to merge morphs #2

Open

LucPrestin opened this issue Dec 7, 2021 · 0 comments

Labels

feature

LucPrestin commented Dec 7, 2021

As a developer, I'd like to use functionality from lively.next in order to make the merge easier and more generic.

Hints & Thoughts

New way to do the three way merge:
1. Clone one of the derived objects
2. Compute the mutations that lead to the second derived object
3. Apply the mutation to the clone whenever possible without conflict
This allows for multiple variants of object merging:
- merge into left
- merge into right
- merge into something new

LucPrestin mentioned this issue

Open

LucPrestin added the feature label

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment