[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Question about manual development

On 02/28/2011 06:37 AM, Jose Luis Zabalza wrote:
> This behavior is due to the action of update-version.sh script and it
> is source of problems because it causes conflicts when someone push
> his version to git repository and you mix your version with git pull.

the date update is not a problem. when try to commit and git doesn't let
you (because you're not fast-forward anymore), you'll do a 'git pull
--rebase' anyway. if that commits in between that you've missed do
contain the date change or not doesn't really mater.

what otoh matters and which is in need of a fix, is, the mess with the
po stuff that leads to trouble during rebasing.

Address:        Daniel Baumann, Burgunderstrasse 3, CH-4562 Biberist
Email:          daniel.baumann@progress-technologies.net
Internet:       http://people.progress-technologies.net/~daniel-baumann/

Reply to: