Re: [openstack-dev] [git] Rebase failed

2014-12-08 Thread Jan Kundrát
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

Re: [openstack-dev] [git] Rebase failed

2014-12-08 Thread Jan Kundrát
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