resolving i18n merge conflicts, is there a policy fot i18n commits?

[Martin Gräßlin]

On Friday 16 March 2012 19:23:18 Oswald Buddenhagen wrote:
> 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 at 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.
That's news to me :-) At least I have been merging from 4.7 to master in kde-
workspace till scripty made it impossible and I have been merging all my 
commits from 4.8 to master. And looking through the commits I'm quite sure 
that others do merge as well.

Cheers
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20120316/b6de71cf/attachment.sig>