Am Donnerstag, 22. September 2011, 15:30:14 schrieb Phil Holmes: > That's what it appears to mean - but since I've done all the commands that > should reset my git to be exactly the same as master, then done a 3 line > change to lily/GNUmakefile, I can't see how there can actually be a > conflict.
As a quick check, look at the commit tree in a graphical UI like qgit or gitk. That will tell you whether your local master branch is really a successor to origin/master. Cheers, Reinhold -- ------------------------------------------------------------------ Reinhold Kainhofer, reinh...@kainhofer.com, http://reinhold.kainhofer.com/ * Financial & Actuarial Math., Vienna Univ. of Technology, Austria * http://www.fam.tuwien.ac.at/, DVR: 0005886 * LilyPond, Music typesetting, http://www.lilypond.org _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
