David Nalesnik <david.nales...@gmail.com> writes: > On Tue, Jul 24, 2012 at 8:56 AM, David Kastrup <d...@gnu.org> wrote: > > "Phil Holmes" <m...@philholmes.net> writes: > > > I get the patch fails to apply - presumably because > > music-functions.scm has been updated twice since the patch was > > created? Does this mean it needs rebasing, or somesuch? > > > Likely. > > > So, in this case, would I do something like: > > git pull -r > > then submit a new patch set?
That's probably the easiest way. You'll likely get a merge conflict with instructions. Personally, I use Emacs and M-x smerge-ediff RET on the problematic file(s) for fixing the merge conflicts. But any editor should do if you search for <<<<< the merge conflict marks. -- David Kastrup _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
