Jan: how would rebasing fix this particular case of careless branching? It's user error not caused by lack knowledge, Anders knows how to do it but just forgot to check out from master. Pushing a careless rebase could be worse.
Martin 19. jun. 2015 20.50 skrev "Jan Blechta" <[email protected]>: > $ git fetch origin > $ git log -2 --oneline origin/logg/fix-issue-534 > bb08e86 Fix issue #534: Redundant built-in meshes demo > 832946b Merge branch 'logg/fix-issue-328' into next > > shows that you've started logg/fix-issue-534 from next. Then you've > merged it into master by > https://bitbucket.org/fenics-project/dolfin/commits/a0bc025. Here some > unrelated changes which were in next but not in master are visible. But > they do not seem harmful. > > Anyway, log shows that it happened several times. We should be more > careful here. > > Jan > > > On Fri, 19 Jun 2015 17:02:09 +0000 > Anders Logg <[email protected]> wrote: > > > 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 >
_______________________________________________ fenics mailing list [email protected] http://fenicsproject.org/mailman/listinfo/fenics
