[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-16 18:23:18
Message-ID: 20120316182318.GA9130 () troll08 ! europe ! nokia ! com
[Download RAW message or body]

On Wed, Mar 14, 2012 at 08:53:07AM +0100, Thomas Lübking wrote:
> 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?
> 
utterly. only kdelibs is merged 4.8 => frameworks. everything else is
cherry-pick. as always has been.
[prev in list] [next in list] [prev in thread] [next in thread]