On Oct 28, 2011, at 2:11 PM, lilyp...@googlecode.com wrote: > > Comment #8 on issue 1981 by d...@gnu.org: Patch: Adds Scheme function for > spring constructor. > http://code.google.com/p/lilypond/issues/detail?id=1981 > > You forgot to rebase when pulling from dev/staging. I took the liberty of > doing that and replacing dev/staging with the result. So your commit now is > 63f43c43a87be99477432e1f3156eac5870b775e > and dev/staging should be pretty enough for fast-forwarding into master again. >
It's not that I forgot, it's that I have no clue what I'm doing with git when things venture outside of the insanely simple. I did git checkout dev/staging git pull git apply foo.diff git commit -a -m "This is my commit message." git push Where should I do the rebase, and what should that line look like? Thanks! Mike _______________________________________________ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond
