From kde-core-devel  Wed Mar 14 07:40:44 2012
From: Oswald Buddenhagen <ossi () kde ! org>
Date: Wed, 14 Mar 2012 07:40:44 +0000
To: kde-core-devel
Subject: Re: resolving i18n merge conflicts, is there a policy fot i18n commits?
Message-Id: <20120314074044.GA23566 () ugly ! local>
X-MARC-Message: https://marc.info/?l=kde-core-devel&m=133171092623089

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?