[aspect-devel] Merge trouble

Wolfgang Bangerth bangerth at tamu.edu
Mon Aug 4 03:45:33 PDT 2014


> 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".

Yes, indeed. Thanks for reassuring me, I already thought I had shot myself in 
the foot again :-)


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

More information about the Aspect-devel mailing list