[Top][All Lists]

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

Re: dev/staging fail: illegal entry in bfrange

From: Graham Percival
Subject: Re: dev/staging fail: illegal entry in bfrange
Date: Sat, 29 Oct 2011 08:45:37 +0100
User-agent: Mutt/1.5.20 (2009-06-14)

On Sat, Oct 29, 2011 at 09:31:16AM +0200, David Kastrup wrote:
> Sigh.  Again it has not been fast-forwarded, but the history has been
> straightened out, dissolving my merge commit.

oops, I think this is my fault.  I haven't read your last 20 or so
emails about git; I was too fixated on working out the logging
bugs in Patchy.

The merge was done with this function:

while the push is ideally done with this function
but instead I followed (the same) instructions here:

I'll spend 30 minutes tomorrow morning working on the git stuff,
unless somebody sends me a diff (an "unofficial diff" of just
writing "line 228 should be xyz" is also fine) and tells me that I
don't need to read that stuff as long as I copy&paste correctly.

sorry about losing track of this.

- Graham

reply via email to

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