On Wed, Mar 14, 2012 at 08:53:07AM +0100, Thomas Lübking wrote:
Am 14.03.2012, 08:40 Uhr, schrieb Oswald Buddenhagen o...@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
Am 16.03.2012, 19:35 Uhr, schrieb Martin Gräßlin mgraess...@kde.org:
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 o...@kde.org:
On Tue, Mar 13, 2012 at
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?
Am 14.03.2012, 08:40 Uhr, schrieb Oswald Buddenhagen o...@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
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
The problem is that i get like a bazillion conflicts in .desktop files and
i can't resolve them by hand, since i cannot read most of the conflicts
El Dimarts, 13 de març de 2012, a les 23:45:56, Thomas Lübking va escriure:
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
The problem is that i get like a bazillion conflicts in .desktop files
Am 14.03.2012, 00:01 Uhr, schrieb Albert Astals Cid aa...@kde.org:
scripty updates .desktop files every day, so do whatever you want with
them,
it will be correct on the next scripty run, so unless you really break
something the date of the release it doesn't matter.
Good to know =)
(i
