Conn tool alpha rcw#375
Merged
dankessler merged 2 commits intoUMPsychMethodsCore:publicfrom Dec 15, 2015
Merged
Conversation
Member
|
Make sure you check out the issue I put up in #378 as it's motivated by this use case. In general, I'm reluctant to merge feature branches directly into public, but I can see how our current policy/workflow is perhaps too restrictive when trying to do things the "official" way so we end up taking shortcuts like this. |
Member
|
On the other hand, this looks like a hotfix, and we've somewhat followed the standards for that. |
Contributor
|
+1 the code looks good to me. If we are following the hotfitx procedure, we need to add a tag after the merge, right? |
Member
Author
|
by the way, this pulls in the fix of #368 |
Member
|
I'll merge this and handle the hotfix, and then backport public (with this fix baked in) into ConnTool_alpha (which will soon roll into _beta anyway) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Putting in fixes of the central template from 10 months ago and a small fix on SOM_WriteNII.m for handling NII what are less that 3D and 4D.