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?
- resolving i18n merge conflicts, is there a policy fot i... Thomas Lübking
- Re: resolving i18n merge conflicts, is there a pol... Albert Astals Cid
- Re: resolving i18n merge conflicts, is there a... Thomas Lübking
- Re: resolving i18n merge conflicts, is there a pol... Oswald Buddenhagen
- Re: resolving i18n merge conflicts, is there a... Thomas Lübking
- Re: resolving i18n merge conflicts, is the... Oswald Buddenhagen
- Re: Re: resolving i18n merge conflicts... Martin Gräßlin
- Re: Re: resolving i18n merge conf... Thomas Lübking