On 03/03/2011 07:09 AM, Jose Luis Zabalza wrote: > Thanks Daniel, but I don't understand what do you mean with (because > you're not fast-forward anymore)
imagine the following situation... you do a git clone of live-manual.git. you commit some changes. after some time, you intend to push it. there are two possible scenarios: 1. in the meanwhile, nobody has pushed anything. the last commit on the repository on the server, and the last commit before your own local commits on your local repository are the same (so, all your commits on top of the commit which was the top commit when you cloned are direct following commits also on top of the current repository state on the server, aka fast-forward). if you do a git push now, everything is fine. 2. in the meanwhile, someone has pushed one or more commits. your local repository is outdated in that regard, that you don't have these commits yet in your local repository. that means, that your local commits do not apply directly on top of the server repository, they are not fast-forward. if you do a git push now, git will tell you that you're not fast-forward and will refuse to push to the server. therefore, you do a git pull --rebase first in order to fetch the missing commits from the server, and rebase your local commits on top of that. if successfull, you do a git push, if unsucessful, you first fix the conflicts. in both situations, this is unrelated to the fact that the date header is modified or not, once you're not fast-forward anymore, you'll have to do a git pull --rebase anyway. > 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. i'm afraid i don't understand what you mean here. -- Address: Daniel Baumann, Burgunderstrasse 3, CH-4562 Biberist Email: daniel.baum...@progress-technologies.net Internet: http://people.progress-technologies.net/~daniel.baumann/ -- 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/4d6f3398.8050...@progress-technologies.net
