search

MRtrix3 / mrtrix3

MRtrix3 provides a set of tools to perform various advanced diffusion MRI analyses, including constrained spherical deconvolution (CSD), probabilistic tractography, track-density imaging, and apparent fibre density
http://www.mrtrix.org
Mozilla Public License 2.0
294 stars 181 forks source link

Master to dev #2893

Closed Lestropie closed 6 months ago

Lestropie commented 6 months ago

Attempting to merge the latest changes on master onto the dev branch. Will need to cross-check the commits with the proposed changes, make sure that merge commit 3d4f392a75672040afeb4fb55e12f54da0a8fa17 doesn't accidentally revert anything.

For the record, I accidentally created merge commit 3d4f392a75672040afeb4fb55e12f54da0a8fa17 on my local dev branch, pushed it, and GitHub actually accepted it, with the following message:

remote: Bypassed rule violations for refs/heads/dev:
remote:
remote: - Changes must be made through a pull request.
remote:

I then couldn't force-push GitHub's dev back one commit because of being locked against force pushes. For now, I've gotten around this by giving myself and @jdtournier the ability to force push to dev. However GitHub should not have accepted that commit in the first place according to the branch settings.

github-actions[bot] commented 6 months ago

clang-tidy review says "All clean, LGTM! :+1:"

github-actions[bot] commented 6 months ago

clang-tidy review says "All clean, LGTM! :+1:"

Lestropie commented 6 months ago

I've done a manual cross-reference of the changeset against the underlying commits, and found one small glitch from manual merge conflict resolution in python/bin/mrtrix3.py (which should disappear soon on dev anyways as part of #2741). Going to merge this to allow its merge into other PRs to unblock them, since this addresses CI failures on dev.

github-actions[bot] commented 6 months ago

clang-tidy review says "All clean, LGTM! :+1:"