search

UMPsychMethodsCore / MethodsCore

All of the projects that the methods core develops, combined into one repository!
7 stars 0 forks source link

Spm8 batch/update to spm8 r6313 #381

Closed rcwelsh closed 8 years ago

rcwelsh commented 8 years ago

@UMPsychMethodsCore/developers

This is now ready, it replaces pull request #377 but relies on pull request #376 to be accepted first. I merged #376 locally into this branch (which was based on universe/spm8Batch_beta).

rcwelsh commented 8 years ago

@dankessler all those graph theory things still pop up.... :-(

dankessler commented 8 years ago

This is to be expected. I think it will look a lot cleaner once the other pull request is merged as the symmetric setdiff will shrink.

Also, it will look a lot cleaner if viewed interactively.

For example, run

git log spm8Batch/newfeature...spm8Batch_alpha --graph --decorate --simplify-by-decoration

That last flag will elide all of this commits and instead show the high level summary that this merge head includes a few new commits along with some the core feature branch.

On Tuesday, November 3, 2015, Robert notifications@github.com wrote:

@dankessler https://github.com/dankessler all those graph theory things still pop up.... :-(

— Reply to this email directly or view it on GitHub https://github.com/UMPsychMethodsCore/MethodsCore/pull/381#issuecomment-153561307 .

Daniel A. Kessler Research Computer Specialist Psychiatry - Rachel Upjohn Building University of Michigan, Ann Arbor kesslerd@umich.edu +1 734.418.8134 www.dankessler.me

dankessler commented 8 years ago

There we go! The diff is now a very manageable 11 lines, down from the 5000+ monster it was!

For posterity, I accomplished this by accepting #376, which pulled the new SPM8 release into core_beta, and then I merged core_beta into spm8Batch_alpha (which is the target of this current pull request)

dankessler commented 8 years ago

+1 from me, pretty minimal update now that the diff is cleaned up