On 08/19/13 21:26, Luiz Capitulino wrote: > On Mon, 22 Jul 2013 23:07:36 +0200 > Laszlo Ersek <ler...@redhat.com> wrote: > >> >> Signed-off-by: Laszlo Ersek <ler...@redhat.com> > > This patch now conflicts, can you respin please?
Can you retry with "git am -3"? "git rebase -i" didn't ask me to do anything manually, so I'm guessing if you let "git am" to do a 3-way merge, it should work. (Of course I don't have anything against posting a v2, this is just an attempt to keep the traffic low.) Thanks! Laszlo
