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

[Albert Astals Cid]

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 and
> i can't resolve them by hand, since i cannot read most of the conflicts :-(

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.

BUT

(i understand you are merging KDE/4.8 to master) If you take KDE/4.8 contents 
over the master ones you'll get an extra commit of scripty fixing it to the 
correct master values so you probably want to take the master version not the 
KDE/4.8 one

Albert

> 
> Cheers,
> Thomas