Skip to content

Conversation

@pdlloyd
Copy link

@pdlloyd pdlloyd commented Oct 21, 2023

This removes the merge conflicts that were preventing @pwighton's 20220414-fs-source branch from merging with the master branch of https://github.com/ReproNim/neurodocker. This will hopefully resolve ReproNim#445

dependabot bot and others added 28 commits September 4, 2023 18:53
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
…ns/actions/checkout-4

Bump actions/checkout from 3 to 4
[FIX] install the proper dependencies for doc build
adding example for dealing with FSL license question in a non-interactive session
added description for interactive containers as discussed here:
ReproNim#475
Mention --yes option here as well and refer to examples
Include FSL license auto-yes example
fix code formatting
[ENH] implement more recent mrtrix version
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
…ns/actions/checkout-4

Bump actions/checkout from 3 to 4
added fsl "6.0.7.1"
Updating master branch reflect ReproNim HEAD
@pwighton
Copy link
Owner

Thanks @pdlloyd!

@pwighton pwighton merged commit 3f586d0 into pwighton:20220414-fs-source Oct 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.