On 19 June 2015 at 17:21, Jan Blechta <[email protected]> wrote: > Next has been (at least once) accidentally merged into master. > > $ git branch --contains 832946b > * master > morandini/add-matrix-get-diagonal > next > $ git show --oneline 832946b > 832946b Merge branch 'logg/fix-issue-328' into next > > I think that master should be carefully examined that it does not > contain any throw-away changes. Any opinions here? > > Next time, please, avoid this. More generally, we should reduce using > merge as a tool for resolution of every problem - merging from > everything to everything. I think it happens too often and history is > unreadable many times. >
Maybe you could write-up some guideline/instruction notes to help us use rebase to keep the history cleaner? Garth > Jan > _______________________________________________ > fenics mailing list > [email protected] > http://fenicsproject.org/mailman/listinfo/fenics _______________________________________________ fenics mailing list [email protected] http://fenicsproject.org/mailman/listinfo/fenics
