2009/6/9 John Mandereau <john.mander...@gmail.com>: > Francisco Vila a écrit : >> >> BTW is it possible that branches have diverged because of the >> breakdown of savannah, and I am having conflicts despite of branches >> having been merged recently? IIRC git told me exactly that but I >> ignored it. > > It's possible. Did you pull master with -r flag before changing master > branch locally, as I recommended?
Frankly, I don't remember. > > >> I am going to fetch a fresh repo to be sure (if and only >> if the repo now in savannah is sane). >> > > I think it's not worth the trouble, unless you see a lot of duplicate > commits in either lilypond/translation or master. Yes I do. Both git log --graph lilypond/translation master and gitk lilypond/translation master show duplicate commits. It is not easy to see, one has to follow long spaghetti threads. -- Francisco Vila. Badajoz (Spain) www.paconet.org _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
