Skip to content
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

Represent conflicts explicitely in IrminMerge.ml #45

Closed
samoht opened this issue Apr 22, 2014 · 0 comments
Closed

Represent conflicts explicitely in IrminMerge.ml #45

samoht opened this issue Apr 22, 2014 · 0 comments

Comments

@samoht
Copy link
Member

samoht commented Apr 22, 2014

from @dbuenzli

https://github.com/samoht/irminsule/blob/master/lib/core/irminMerge.mli
No deep look at this but I see an exception for Conflicts. Any reason why conflicts are not represented explicitly and conflict resolution managed through other combinators ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant