This is the mail archive of the
mailing list for the Archer project.
Re: [dwz-multifile-rebase] conflict resolution; not pushed
- From: Tom Tromey <tromey at redhat dot com>
- To: Jan Kratochvil <jan dot kratochvil at redhat dot com>
- Cc: archer at sourceware dot org
- Date: Wed, 18 Jul 2012 10:13:17 -0600
- Subject: Re: [dwz-multifile-rebase] conflict resolution; not pushed
- References: <20120714211925.GA21897@host2.jankratochvil.net>
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.