-
Notifications
You must be signed in to change notification settings - Fork 533
ENH: Extended MRtrix3 interface #2299
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
Throw a warning instead.
ENH: Explicit garbage collection in MultiProc
[ENH] Logging - indicate whether the node was cached
[ENH] Logging - MultiProc report current tasks
…ref/interface-base
[MAINT] Reorganize nipype.interfaces.base
ENH: Improve loop timing in DistributedPluginBase
ENH: Profile VMS as well as RSS
I see again some conflicts (not present before) that I am not able to resolve. Do I need to merge master again? |
@matteomancini - yes - my worry with the previous set of changes is that it seemed to revert changes in master. so one option is to merge with master, resolve any conflicts and then push here. if the changes look fine great. if they look like they are reverting some intended changes (such as adding spaces, where there shouldn't be), then close and start another PR. |
This looks like one of those weird GitHub issues. Running a diff from this branch to master on the command line is much more reasonable. I'm closing this PR. @matteomancini can you open a new PR on the same branch? It should have a much simpler diff. |
The issue was committing the changes without the last check-before-commit, the last commit ("fixed tests") was correct. In any case, I opened a new PR: #2338 |
Changes proposed in this pull request: