Am Sunday, 21. August 2011, 20:39:05 schrieb m...@apollinemike.com: > On Aug 21, 2011, at 8:30 PM, Janek Warchoł wrote: > > commit 9c319db89ecc46cbf6c9c35e759eba973e412bb0 > > Merge: 49ef4f0 fb47959 > > Author: Mike Solomon <m...@apollinemike.com> > > Date: Sun Aug 21 17:19:28 2011 +0200 > > > > Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/lilypond > > For the record, I don't remember doing this. Does anyone know how this > sorta thing happens?
This happens if you do a "git pull" and you have a local commit. Git will then merge your changes and the changes from other developers... That's why we recommend to use either "git pull -r" or equivalently "git fetch; git rebase origin/master". This will take your local commit and move it 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
