Re: Auto-merging translations and master

[David Kastrup]

John Mandereau <address@hidden> writes:

> Il giorno mar, 05/06/2012 alle 11.16 +0200, David Kastrup ha scritto:
>> The only automatic merges that are actually safe to do are
>> fast-forwards, and the translation merges are not of that kind.
>
> Aren't merges that don't produce conflicts safe to handle with a
> non-interactive cron job?

Change A redefines a function and its callers.

Change B introduces another call of the function.

No merge conflict.

-- 
David Kastrup