Ok! I think we're on the same page then. Martin
On 13 May 2013 09:56, Garth N. Wells <[email protected]> wrote: > On 13 May 2013 08:51, Anders Logg <[email protected]> wrote: >> On Mon, May 13, 2013 at 09:49:45AM +0200, Martin Sandve Alnæs wrote: >>> FYI: It seems that somebody has merged next into master in dolfin. >>> This is not supposed to happen in the gitworkflows model. >>> >>> There's no need to revert anything, just making a note for future >>> improvement. I realise it will take a little time for everyone to get >>> used to git before we can expect gitworkflows to be followed strictly. >>> >>> I will however stress that such a workflow can not be followed >>> strictly by some and broken at will by others, as that may quickly >>> remove the benefits and give us only the overhead of additional >>> dicipline. >> >> Can you spot who did the merge and when it happened? Not to put blame >> on anyone, but it might be useful to find out what went wrong. >> > > It was me and it's already been discussed on this mailing list. > > Discipline has nothing to do with it at this stage. We're all adapting > to both a new workflow and a new (and much more complicated) version > control system. > > Garth > >> -- >> Anders >> _______________________________________________ >> fenics mailing list >> [email protected] >> http://fenicsproject.org/mailman/listinfo/fenics _______________________________________________ fenics mailing list [email protected] http://fenicsproject.org/mailman/listinfo/fenics
