dolfin team mailing list archive
-
dolfin team
-
Mailing list archive
-
Message #25481
Re: Merge problem
-
To:
Joachim Berdal Haga <jobh@xxxxxxxxx>
-
From:
Anders Logg <logg@xxxxxxxxx>
-
Date:
Tue, 28 Feb 2012 13:10:08 +0100
-
Authentication-results:
mr.google.com; spf=pass (google.com: domain of logg@xxxxxxxxx designates 10.152.147.1 as permitted sender) smtp.mail=logg@xxxxxxxxx
-
Cc:
DOLFIN Mailing List <dolfin@xxxxxxxxxxxxxxxxxxx>
-
In-reply-to:
<CAPKc5=8tgf6MHhg4h_vYCmGHzSzuF-h84=GV7SdVhY47Mqbt4g@mail.gmail.com>
-
User-agent:
Mutt/1.5.21 (2010-09-15)
On Tue, Feb 28, 2012 at 08:49:06AM +0100, Joachim Berdal Haga wrote:
> On 27 February 2012 20:43, Anders Logg <logg@xxxxxxxxx> wrote:
> > I just merged Joachim's symmetric assembly branch into my own branch
> > and can't build because of the following line in GenericMatrix.cpp:
>
> I don't know about this particular problem, but would it help if I
> merged trunk into my branch?
I'll try again and merge into a clean trunk branch. Maybe it was
screwed up by my other changes.
--
Anders
References
