← Back to team overview

dolfin team mailing list archive

Re: Merge problems

 

On Thu, Feb 03, 2011 at 03:03:54PM -0800, Johan Hake wrote:
> On Thursday February 3 2011 14:45:55 Anders Logg wrote:
> > Looking at this again, how is it different from just removing the
> > middle repository (~/dolfin-test) and communicating via B and C
> > directly from ~/dolfin-logg?
>
> That was actually my initial thought.
>
> But you might have done some changes to ~/dolfin-logg after you have pushed it
> to lp:dolfin-logg for testing. Making it more difficult to push to lp:dolfin-
> main. But I guess you should be able to just cherrypick the revisions (the one
> you have tested in lp:dolfin-logg) you push to lp:dolfin-main.

I'll try the simple approach with just one local repository for a
little while and see how it goes.

--
Anders



References