-
Notifications
You must be signed in to change notification settings - Fork 481
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.
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
Conflict Detection and Local Resolution in FedPlan #2175
Conversation
Great - thanks for the contribution @min-guk. Please address the minor cleanups as discussed today and then we can merge it in. |
I wanted to share some minor updates that I've been working on:
|
However, the current detect-and-resolve approach resolves conflicts from top to bottom, which poses a risk of producing inaccurate results because it resolves conflicts higher up while lower-level conflicts are still present. I understand that this is not an ideal approach, but I am struggling to come up with an appropriate solution to address this issue. I would greatly appreciate any advice or suggestions you could provide. |
Thanks for pointing out these challenges - then let's try the approach of marking FedPlans as conflicts in a first pass (materialized in FedPlan), and in a second bottom-up pass we then fix these issues. |
LGTM - thanks for the patch @min-guk. During the merge I fixed the missing license header and incorrect formatting (tabs over spaces) of new files, unnecessary imports, and wrong javadoc. |
Implementation Summary
Limitations
The current implementation has the following limitations:
While this approach works, exploring better solutions to address these issues would be valuable.
Questions
Future Work