Re: move conflict resolution UI (was: Re: branch 1.8 or at least start making alpha releases?)

On Fri, Feb 15, 2013 at 9:07 AM, Stefan Sperling <stsp_at_elego.de> wrote:

> Note that I am referring to options offered by the CLI user interface,
> not the API. The API might expose more low-level operations as has been
> requested by GUI client developers in the past. But since we haven't
> really advanced the conflict resolution API yet, I suppose we should
> try to do the best we can do for 1.8 using the existing API.

I would be fine if the API provides more options, as long as it also
provides the same options as the CLI. IOW, if the CLI has an option
to resolve conflicts and under the covers it resolves different
conflicts in different ways, I would want a simple option like that in
the API too. I would not want to have to reimplement the same
decision logic as the CLI and then call a lower level API.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/