From: Chris Brannon <chris@the-brannons.com>
To: edbrowse-dev@lists.the-brannons.com
Subject: Re: [Edbrowse-dev] even more confused
Date: Tue, 24 Dec 2013 08:26:03 -0800 [thread overview]
Message-ID: <874n5yb4h0.fsf@mushroom.PK5001Z> (raw)
In-Reply-To: <20131124111303.eklhad@comcast.net> (Karl Dahlke's message of "Tue, 24 Dec 2013 11:13:03 -0500")
Karl Dahlke <eklhad@comcast.net> writes:
> and Chris did the same thingtoo, in another branch.
I discarded my changes after I saw that yours were pushed.
Sorry for all the confusion. I had some spare cycles this morning, and
I wanted to start moving forward.
> previous rebase directory /home/eklhad/progs/edbrowse/.git/rebase-apply still exists but mbox given.
>
You should run git am --abort to clear this up. My guess is that you
ran git am at some point in the distant past and it failed, leaving that
rebase-apply directory.
So after --abort, you should be able to apply both of these.
I've done it over here, so I can push them if need be.
As an aside, in patch 4/4, we should probably use JS_H, rather than
_JS_H.
> if both those branches have zillions of changes to essentially the same lines of code,
> which is already the case for us,
No, see above. My branch incorporates your eb_bool change, rather than
my aborted one.
-- Chris
next prev parent reply other threads:[~2013-12-24 16:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-24 16:13 Karl Dahlke
2013-12-24 16:26 ` Chris Brannon [this message]
2013-12-24 16:36 ` Adam Thompson
2013-12-24 16:31 ` Adam Thompson
2013-12-24 17:06 ` Chris Brannon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874n5yb4h0.fsf@mushroom.PK5001Z \
--to=chris@the-brannons.com \
--cc=edbrowse-dev@lists.the-brannons.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).