[hipl-dev] Re: [Merge] lp:~diego-biurrun/hipl/hipfw-performance into lp:hipl
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: hipl-dev@xxxxxxxxxxxxx
- Date: Thu, 13 Jan 2011 19:09:27 +0100
Please keep launchpad in the CC:.
On Thu, Jan 13, 2011 at 05:13:32PM +0100, Christof Mroz wrote:
> On Thu, 13 Jan 2011 10:22:39 +0100, Diego Biurrun <diego@xxxxxxxxxx> wrote:
>
>> Please delete your branch and use mine as the basis for further work,
>> it incorporates a bunch of fixes and is synchronized to a more recent
>> version of HIPL.
>
> IIRC Stefan pointed out at least one instance where it wasn't clear
> whether you merged the right thing, so I rather planned on incrementally
> merging with your branch first to re-evaluate the decisions (and
> discard/alter individual commits based on that), and then merge with
> trunk.
No, you are right, at least doublecheck my branch first.
Diego
Other related posts:
