public inbox for
 help / color / mirror / Atom feed
From: Tom Tromey <>
To: Jan Kratochvil <>
Subject: Re: [dwz-multifile-rebase] conflict resolution; not pushed
Date: Wed, 18 Jul 2012 16:13:00 -0000	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <> (Jan Kratochvil's message of "Sat, 14 Jul 2012 23:19:25 +0200")

Jan> FYI I made this local merge but I did not push it, do whatever you
Jan> like with it.

Jan> (What I pushed I also reverted and it was not a GIT-merge so it should be
Jan> a nop.)

Thanks.  I actually had already done a rebase here, but I did it late on
Friday and then didn't think to push it.  Sorry about the duplicated work.


      reply	other threads:[~2012-07-18 16:13 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-14 21:19 Jan Kratochvil
2012-07-18 16:13 ` Tom Tromey [this message]

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \

* 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 read-only IMAP folder(s) and NNTP newsgroup(s).