[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    Re: resolving i18n merge conflicts, is there a policy fot i18n commits?
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2012-03-14 7:40:44
Message-ID: 20120314074044.GA23566 () ugly ! local
[Download RAW message or body]

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?
[prev in list] [next in list] [prev in thread] [next in thread]