deltacloud-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Lutterkort <lut...@redhat.com>
Subject Re: [PATCH] CIMI: adding system support
Date Sat, 09 Feb 2013 01:14:32 GMT
On Fri, 2013-02-08 at 19:13 +0200, marios@redhat.com wrote:
> Hi Dies:
> 
> On 08/02/13 14:10, Koper, Dies wrote:
> > This is a work in progress. At the moment I'm not making any progress
> > though:
> > 
> 
> unfortunately the patch won't apply - I think you need to rebase it and
> send again. I couldn't spot the problem from a visual inspection - but
> there's a lot of code there so hopefully I can have a better look with a
> fresh patch on Monday,

For some of these situations, the right incantation is 'git am --3way
PATCH' - that worked for me in this case.

David



Mime
View raw message