What does this mean? That master contains the merge of logg/fix-issue-328 into next?
Unless I was drunk I have never typed `git merge next`. I've only ever done this: $ git checkout next && git pull $ git merge logg/fix-foo $ <wait for buildbot> $ git checkout master && git pull $ git merge logg/fix-foo I assume this is correct. -- Anders fre 19 juni 2015 kl 18:21 skrev Jan Blechta <[email protected]>: > 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. > > Jan > _______________________________________________ > fenics mailing list > [email protected] > http://fenicsproject.org/mailman/listinfo/fenics >
_______________________________________________ fenics mailing list [email protected] http://fenicsproject.org/mailman/listinfo/fenics
