Re: [PATCH v2] rebase -i: improve advice on bad instruction lines
- From
Ralf Thielow <ralf.thielow@gmail.com>
- Date
- Sep 7, 2016, 17:07 UTC
- Message-ID
- <CAN0XMO+diDLXUrxjNGnUi6oUEwkcGavEX8vyGWy2+Wju-N4WJQ@mail.gmail.com>
- In-Reply-To
- <1473240491.20551.1.camel@kaarsemaker.net>
2016-09-07 11:28 GMT+02:00 Dennis Kaarsemaker <dennis@kaarsemaker.net>:
Show 5 quoted lines
> Hi Ralf, > > There are quite a few patch series in flight these days around > interactive rebase. Have you checked for conflicts with those? >
Thanks. I did not check against 'pu' when I created this patch but I'm able to apply without any conflicts.