On Tue, 3 Jun, 2014 at 7:59 PM, Anders Logg <[email protected]> wrote:
I'm working on a topic branch that I want to merge into `next` and
then
`master` (for ffc).
I first merged `master` into my branch and fixed some issues
Then I tried to merge my branch into `next`.
I believed that any problems would be discovered in the first step
(merging from `master`) but the problems show up when I merge into
`next`. Is this expected?
Or is it just that someone happened to merge something conflicting
with my changes into `next` which is not yet in `master`?
Possibly. I'm also having unexpected trouble merging into next. Was
'next' properly reset to 'master?
Garth
--
Anders
_______________________________________________
fenics mailing list
[email protected]
http://fenicsproject.org/mailman/listinfo/fenics
_______________________________________________
fenics mailing list
[email protected]
http://fenicsproject.org/mailman/listinfo/fenics
