[openstack-dev] [git] Rebase failed
jkt at kde.org
Mon Dec 8 09:02:17 UTC 2014
On Monday, 8 December 2014 09:57:15 CEST, Jan Kundrát wrote:
> On Monday, 8 December 2014 09:25:43 CEST, Eduard Matei wrote:
>> So i removed it locally (git rm ... ) and now rebase worked, but now i had
>> an extra patchset.
>> Will this be merged automatically or does it need again reviewers ?
> Make sure you have a single commit which includes both the `git
> rm` and your original changes, and that this commit still has
> the same Change-Id line as the one you uploaded originally.
And on a re-read, it seems that you already know that very well, so in that
case, sorry for noise.
/me grabs that coffee again.
Trojitá, a fast Qt IMAP e-mail client -- http://trojita.flaska.net/
More information about the OpenStack-dev