Repository navigation
bring mne-opm up to date with base package - #2
Merged
Merged
Conversation
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: mne[bot] <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Daniel McCloy <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: mne[bot] <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Marijn van Vliet <[email protected]> Co-authored-by: Eric Larson <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: mne[bot] <[email protected]>
Co-authored-by: Daniel McCloy <[email protected]>
Co-authored-by: Carina Forster <[email protected]> Co-authored-by: Thomas S. Binns <[email protected]> Co-authored-by: Scott Huberty <[email protected]> Co-authored-by: Erica Peterson <[email protected]> Co-authored-by: Eric Larson <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Marijn van Vliet <[email protected]>
Co-authored-by: Eric Larson <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: mne[bot] <[email protected]>
…ed (#13688) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Thomas S. Binns <[email protected]> Co-authored-by: Daniel McCloy <[email protected]>
Co-authored-by: Eric Larson <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Scott Huberty <[email protected]>
… is zero (#13714) Co-authored-by: Marijn van Vliet <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Daniel McCloy <[email protected]> Co-authored-by: Bru <[email protected]> Co-authored-by: Stefan Appelhoff <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mne[bot] <[email protected]> Co-authored-by: Eric Larson <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: mne[bot] <[email protected]> Co-authored-by: Eric Larson <[email protected]>
Co-authored-by: Claude Sonnet 4.6 <[email protected]>
…13584) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Daniel McCloy <[email protected]>
…actions group (#13897) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mne[bot] <[email protected]> Co-authored-by: Eric Larson <[email protected]>
Co-authored-by: Eric Larson <[email protected]>
…n_t_test(). (#13813) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Erica R Peterson <[email protected]>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Eric Larson <[email protected]>
…actions group (#13901) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mne[bot] <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: mne[bot] <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mne[bot] <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: mne[bot] <[email protected]>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Eric Larson <[email protected]>
Co-authored-by: Thomas S. Binns <[email protected]> Co-authored-by: Daniel McCloy <[email protected]>
harrisonritz
pushed a commit
that referenced
this pull request
Oct 2, 2026
Merge performed against the true synchronization point (upstream commit e4cb5ab, 2026-05-27) rather than git's computed merge-base (87d1051, 2026-02-09). The fork's "bring mne-opm up to date with base package (#2)" commit was a squash, so git did not know upstream content up to e4cb5ab was already present; using the computed merge-base produced ~187 spurious conflicts (CI configs, docs, sphinxext JSON, ...). Against the true base the merge is textually clean and carries only the fork's real changes: - maxwell_filter(st_only="ext") + related tests / docs - device_info-based helmet selection in _get_meg_system, bundled Cerca helmet - tools/import_helmet.py, tools/helmet_ch_pos_from_tsv.py - FIFF_UNIT_RAD unit name; eyegaze/pupil coil-type mapping in set_channel_types
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
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.
No description provided.