Am 14.03.2012, 08:40 Uhr, schrieb Oswald Buddenhagen <ossi@kde.org>:

> On Tue, Mar 13, 2012 at 11:45:56PM +0100, Thomas Lübking wrote:
>> Is there any policy on i18n commits/conflicts, ie. like only 4.8 is up  
>> to
>> date (seems to me?) so one can safely
>> git merge -Xtheirs origin/KDE/4.8
>>
> what exactly are you merging?

kde-workspace, local KDE/4.8 -> local master
resolved merge i18n conficts "-s ours" from origin/KDE/4.8, then merged  
local KDE/4.8 into local master

wrong?

Cheers,
Thomas