2011/3/2 Daniel Baumann <daniel.baum...@progress-technologies.net>: > 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.
Thanks Daniel, but I don't understand what do you mean with (because you're not fast-forward anymore) so I don't understand why we need make a git pull --rebase (I read git rebase manual but do not understand it) . Otoh I don't understand why make commit must change some file if i don't change any "source file". If you say this is correct, I no doubt, but I don't understand it. Bye. -- José Luis Zabalza jlz.3008 a t gmail.com Linux Counter 172551 -- To UNSUBSCRIBE, email to debian-live-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/AANLkTikaJjr3F0WtkXGgwiQ-4Uhe5q3gqLfB=4qj2...@mail.gmail.com
