On Wed, Jun 12, 2013 at 1:57 PM, Stefan Sperling <s...@elego.de> wrote: > On Wed, Jun 12, 2013 at 01:34:37PM +0200, Johan Corveleyn wrote: >> Can't we improve this? (not talking about emergency fixing 1.8.x, but >> thinking longer term). Can't we put the incoming edits "somewhere", so >> the user can do something useful (manually) with them? Perhaps put >> them in the moved-file with conflict markers around them, like we do >> for text conflicts? > > I believe that in the future we'll just update the moved-away files > by default, without even asking the user. This way, the edit shows > up in the moved-away file, just as it does now if the user chooses > 'mine-conflict' at the prompt.
Okay, but doesn't "postpone" still needs to have a well defined behavior (and probably "as good as possible"), even if only for supporting the --accept=postpone command line option? -- Johan
