[aspect-devel] Merge trouble

[Timo Heister]

Wolfgang,

this is no problem at all. If you look at the commit in gitk or using
"git show 2e76" you can see that there are very little changes that
were actually done (only changes.h). You are looking at "what is
changed on the branch since the last commit", not "what changes were
done to master after merging in the branch by this commit".

On Sat, Aug 2, 2014 at 2:21 AM, Wolfgang Bangerth <bangerth at tamu.edu> wrote:
>
> 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/
>
> _______________________________________________
> Aspect-devel mailing list
> Aspect-devel at geodynamics.org
> http://lists.geodynamics.org/cgi-bin/mailman/listinfo/aspect-devel