[aspect-devel] Merge trouble

[Wolfgang Bangerth]

Timo and Jonathan
I merged issue #153 but only then realized that it actually had a merge from 
mainline in it. In other words, we now have the mammoth commit 2e7647 in the tree:

https://github.com/jperryhouts/aspect/commit/2e7647df4d741cb8c27f3935b709f4d1c607fefd

This could have been avoided if #153 had just been rebased on master, instead 
of merging master into it. Is it worth undoing the last merge?

Best
  Wolfgang

-- 
------------------------------------------------------------------------
Wolfgang Bangerth               email:            bangerth at math.tamu.edu
                                 www: http://www.math.tamu.edu/~bangerth/