Code

Bug channel annot merge#275

Code

Merged

larsoner merged 13 commits intomne-tools:mainmne-tools/mne-qt-browser:mainfrom nmarkowitz:BUG-channel-annot-mergenmarkowitz/mne-qt-browser:BUG-channel-annot-mergeCopy head branch name to clipboardAug 18, 2024

+69-7

Commits

Commits on Jul 8, 2024

• initial attempts to fix

  nmarkowitz

  committed
  e9a64a6

Commits on Jul 9, 2024

• comment new lines to debug

  nmarkowitz

  committed
  44be37b

Commits on Jul 17, 2024

• prevent combo generic and chan annots

  nmarkowitz

  committed
  971c799

• update warning message

  nmarkowitz

  committed
  94ef441

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

  nmarkowitz

  authored
  fb76b85

Commits on Jul 24, 2024

• Merge branch 'main' into BUG-channel-annot-merge

  nmarkowitz

  authored
  aa5ea49

Commits on Aug 8, 2024

• fix merge annot bug

  nmarkowitz

  committed
  799f6e1

Commits on Aug 13, 2024

• Merge branch 'main' into BUG-channel-annot-merge

  nmarkowitz

  authored
  a9217d9

Commits on Aug 15, 2024

• create unit tests for annot merging

  nmarkowitz

  committed
  cd3ab6f

• Merge branch 'BUG-channel-annot-merge' of https://github.com/nmarkowitz/mne-qt-browser into BUG-channel-annot-merge

  nmarkowitz

  committed
  9bd4f6c

• add unit tests for ch specific annots

  nmarkowitz

  committed
  1e096ae

Commits on Aug 16, 2024

• update ch specific unit test

  nmarkowitz

  committed
  85e2051

• Merge branch 'main' into BUG-channel-annot-merge

  nmarkowitz

  authored
  131a3aa