jmfaleiro
commented
11 years ago On a related note, processes should register a conflict handler with ShMem before they can start acquiring and releasing.
Open jmfaleiro opened 11 years ago
jmfaleiro
commented
11 years ago On a related note, processes should register a conflict handler with ShMem before they can start acquiring and releasing.
Need a way to communicate merge conflicts to processes. This needs to happen in a way that allows it to manually fix conflicts.
Here is what I propose:
The exception should give three pieces of information to the process: 1) The path that led to the conflict 2) The node in the process's state that caused the conflict. 3) The node in the remote process's state that caused the conflict.
Once fixed, the merging process should just continue where it left off.