/manage

Fragment of a discussion from Talk:Roadmap/2010

non-interactive is only acceptable if it skips conflicts only to show them later in interactive mode.

Siebrand18:48, 28 July 2010

Ideally you should be able tho choose the actions for different cases. The default action for conflict case could be ignore or import and fuzzy.

Nike18:51, 28 July 2010