Hi, On Fri, 5 Jan 2007, John Mandereau wrote:
> Daniel Tonda wrote: > > > > Should I do the pull after the modifications? > > Yes, and it might tell you that you have to merge. I don't think that it will tell you that you have to merge: you have no uncommitted files. It will realize that you have progressed since last pulling (or branching), and that upstream has progressed, too, and perform a merge itself (that is what pull does: fetch _and_ merge). Then it will find that the changes are already in, and be happy. However, do not expect the commit id to be the same as the upstream commit id: Your line of development _is_ different, even if the resulting _tree_ is not, so from now on you will have a side branch from the upstream. But that is okay, since it reflects reality. Ciao, Dscho _______________________________________________ lilypond-devel mailing list [email protected] http://lists.gnu.org/mailman/listinfo/lilypond-devel
