[aspect-devel] Merge trouble

Wolfgang Bangerth bangerth at tamu.edu
Fri Aug 1 23:21:19 PDT 2014

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:


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?


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

More information about the Aspect-devel mailing list