[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: push patch for issue 2679

From: David Kastrup
Subject: Re: push patch for issue 2679
Date: Tue, 24 Jul 2012 17:02:42 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1.50 (gnu/linux)

David Nalesnik <address@hidden> writes:

> On Tue, Jul 24, 2012 at 8:56 AM, David Kastrup <address@hidden> wrote:
>     "Phil Holmes" <address@hidden> 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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]