Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Bug channel annot merge #275

Merged
merged 13 commits into from
Aug 18, 2024
Merged

Bug channel annot merge #275

merged 13 commits into from
Aug 18, 2024

Commits on Jul 8, 2024

  1. initial attempts to fix

    @nmarkowitz
    nmarkowitz committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    e9a64a6 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. comment new lines to debug

    @nmarkowitz
    nmarkowitz committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    44be37b View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. prevent combo generic and chan annots

    @nmarkowitz
    nmarkowitz committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    971c799 View commit details
    Browse the repository at this point in the history

  2. update warning message

    @nmarkowitz
    nmarkowitz committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    94ef441 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'mne-tools:main' into BUG-channel-annot-merge

    @nmarkowitz
    nmarkowitz committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    fb76b85 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. Merge branch 'main' into BUG-channel-annot-merge

    @nmarkowitz
    nmarkowitz committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    aa5ea49 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. fix merge annot bug

    @nmarkowitz
    nmarkowitz committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    799f6e1 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. Merge branch 'main' into BUG-channel-annot-merge

    @nmarkowitz
    nmarkowitz committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    a9217d9 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. create unit tests for annot merging

    @nmarkowitz
    nmarkowitz committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    cd3ab6f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'BUG-channel-annot-merge' of https://github.com/nmarkowi… 

    …tz/mne-qt-browser into BUG-channel-annot-merge
    @nmarkowitz
    nmarkowitz committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    9bd4f6c View commit details
    Browse the repository at this point in the history

  3. add unit tests for ch specific annots

    @nmarkowitz
    nmarkowitz committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    1e096ae View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2024

  1. update ch specific unit test

    @nmarkowitz
    nmarkowitz committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    85e2051 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into BUG-channel-annot-merge

    @nmarkowitz
    nmarkowitz committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    131a3aa View commit details
    Browse the repository at this point in the history