This is the mail archive of the
archer@sourceware.org
mailing list for the Archer project.
Re: Problem merging with git
- From: Phil Muldoon <pmuldoon at redhat dot com>
- To: Jan Kratochvil <jan dot kratochvil at redhat dot com>
- Cc: Rick Moseley <rmoseley at redhat dot com>, Project Archer <archer at sourceware dot org>, Tom Tromey <tromey at redhat dot com>
- Date: Wed, 18 Feb 2009 16:16:11 +0000
- Subject: Re: Problem merging with git
- References: <499C2E08.8090502@redhat.com> <20090218161112.GA16699@host0.dyn.jankratochvil.net>
Jan Kratochvil wrote:
Answering as I was CC'd:
According to
for i in `git branch -r|grep archer-`;do git diff origin/master...$i|grep -q COPYING.NEWLIB && echo $i;done
these are
origin/archer-pmuldoon-pretty-printers-lookup
The parent of: archer-pmuldoon-pretty-printers-lookup is
archer-tromey-python so I suspect that is why you see the
archer-pmuldoon-pretty-printers-lookup here..
Anyway it (archer-pmuldoon-pretty...) is not included in the current
merge with the patch-set that Rick is working with (this branch will
eventually die and the changes merge into the archer-tromey-python branch).
Regards
Phil