So the problem was I created my topic branch from next. This seems like a probable mistake (having just merged another branch into next for testing). I know new branches should be based on master, so if I understand correctly our workflow is correct but failed this time because of a human error?
-- Anders fre 19 juni 2015 kl 22:06 skrev Martin Sandve Alnæs <[email protected]>: > Ok Jan, then we're in agreement. > > I think the "merge master into master" message occurs when someone has > their own fork and merges the official master in the web interface. > > We should ask that people don't do that. I.e don't merge anything into > your topic branch unless it's for a good reason. > > Martin > 19. jun. 2015 21.32 skrev "Jan Blechta" <[email protected]>: > >> On Fri, 19 Jun 2015 18:30:26 +0100 >> "Garth N. Wells" <[email protected]> wrote: >> >> > 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? >> >> I don't want to encourage more rebasing but less (non-fast-forward) >> merging. Everybody should read and follow >> >> https://bitbucket.org/fenics-project/dolfin/wiki/developer-instructions-git >> >> On the other hand, integration of topic branches (into master) >> shouldn't typically be fast-forward: >> (master) $ git merge --no-ff author/topic >> >> Jan >> >> > >> > Garth >> > >> > > 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 >> >
_______________________________________________ fenics mailing list [email protected] http://fenicsproject.org/mailman/listinfo/fenics
