On Oct 6, 2013, at 6:05 PM, Jed Brown <[email protected]> wrote: > Barry Smith <[email protected]> writes: > >> What does *completely* merged here in this context? Would a branch >> that was merged, but then modified and that modified version not >> merged be "incompletely" merged? > > Exactly.
If someone "fixed" a branch like this why won't they merge it into master or next? Likely because they "forgot" that step? If this is the case then I will point out yet again this is a flaw with the tool, not the person. Any software that assumes and requires the user do the right thing every time is crap software. If a branch is already merged into next or master is there some way when a person does a commit on the branch in the future it asks or reminds them if they want to merge into next or master, i.e. reminds them right there and then what they should do? Barry > >> How do we make sure those modifications get into master if the >> person who "owns" the branch is not aware that the modification >> hasn't gotten into master (or next). > > Those branches show up here: > > $ git branch -r --no-merged next > origin/balay/remove-sdir > origin/barry/august-tutorial > origin/barry/feature-ams > origin/barry/fix-get-create > origin/barry/fix-mat-checkinode-factorlu > origin/barry/html > origin/barry/saws > origin/barry/superlu_mt > origin/barry/tikz > origin/barry/twitter > origin/barry/wirth-fusion-materials > origin/barry/xcode > origin/hzhang/fix-ptaptest > origin/hzhang/ksp-minresqlp > origin/hzhang/snes-jacobiancoloropt > origin/jed/august-tutorial > origin/jed/cray-externc > origin/jed/ksp-plugin > origin/jed/mat-eigenvalue-cache > origin/jed/missing-prototype > origin/jed/ts-heat-plex > origin/karlrupp/doc-doxygen > origin/karpeev/fix-pc-fieldsplit-reset > origin/klaij/fieldsplit-simple-ex70 > origin/knepley/dmswarm > origin/knepley/feature-dmda-section > origin/knepley/feature-plex-refine-3d > origin/knepley/fix-mem-init > origin/knepley/pylith > origin/knepley/solkx > origin/knepley/swarm > origin/madams/gamg-parmtests > origin/madams/gamg-tests > origin/madams/gamg-tests-rebased > origin/madams/gamg-tests2 > origin/madams/sor-residual > origin/maint > origin/master > origin/paulmullowney/cusp-sequential-vector-scatter > origin/prbrune/mat-matcolor > origin/prbrune/pcgamg-bootstrap > origin/prbrune/snes-fasadditive > origin/prbrune/snes-fasfull > origin/psanan/ts-bz-examples > origin/psanan/ts-multiscale > origin/psanan/ts-rhs-partitions > origin/psanan/ts-tests > origin/sarich/rnet-all > origin/sarich/rnet-fix-rebase > origin/sarich/rnet-import > origin/shri/FTRTDS-project > origin/shri/feature-dm-circuit > origin/shri/projects-dmcircuit > origin/stefano_zampini/pcbddc-baijfixes
