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

Improve merging and iterative merging #3487

Open
wants to merge 90 commits into
base: main
Choose a base branch
from
Open

Improve merging and iterative merging #3487

wants to merge 90 commits into from

Commits on Oct 16, 2024

  1. WIP

    @yger
    yger committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    3221527 View commit details
    Browse the repository at this point in the history

  2. Iterative merges

    @yger
    yger committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    557a77a View commit details
    Browse the repository at this point in the history

  3. WIP

    @yger
    yger committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    ee23401 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'auto_merge_refactoring' into meta_merging

    @yger
    yger committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    813c888 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'auto_merge_refactoring' into meta_merging

    @yger
    yger committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    af0cfa8 View commit details
    Browse the repository at this point in the history

  6. WIP

    @yger
    yger committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    a399b28 View commit details
    Browse the repository at this point in the history

  7. WIP

    @yger
    yger committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    1aeaecf View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. WIP

    @yger
    yger committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    9642e15 View commit details
    Browse the repository at this point in the history

  2. Display

    @yger
    yger committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    fb63348 View commit details
    Browse the repository at this point in the history

  3. Harmonization of splitting functions and removing dependencies

    @yger
    yger committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    c88f43b View commit details
    Browse the repository at this point in the history

  4. WIP

    @yger
    yger committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    49efdb1 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2024

  1. WIP

    @yger
    yger committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    297b6b0 View commit details
    Browse the repository at this point in the history

  2. WIP

    @yger
    yger committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    b5a7800 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'SpikeInterface:main' into meta_merging

    @yger
    yger authored Oct 18, 2024
    Configuration menu
    Copy the full SHA
    8e8d91e View commit details
    Browse the repository at this point in the history

  4. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    08a599b View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2024

  1. Merge branch 'SpikeInterface:main' into meta_merging

    @yger
    yger authored Oct 28, 2024
    Configuration menu
    Copy the full SHA
    b10ca04 View commit details
    Browse the repository at this point in the history

  2. Adding tests

    @yger
    yger committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    e7fe01a View commit details
    Browse the repository at this point in the history

  3. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    7f53178 View commit details
    Browse the repository at this point in the history

  4. Naming

    @yger
    yger committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    96ceb9b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'meta_merging' of github.com:yger/spikeinterface into me… 

    …ta_merging
    @yger
    yger committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    ae42eb9 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'auto_merge_refactoring' into meta_merging

    @yger
    yger committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    467c751 View commit details
    Browse the repository at this point in the history

  7. Adding an auto_merge_iterative function

    @yger
    yger committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    ae8de50 View commit details
    Browse the repository at this point in the history

  8. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    0a64a67 View commit details
    Browse the repository at this point in the history

  9. Adding tests

    @yger
    yger committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    109abf0 View commit details
    Browse the repository at this point in the history

  10. Tests

    @yger
    yger committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    ef3f4bc View commit details
    Browse the repository at this point in the history

  11. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    07fdb5b View commit details
    Browse the repository at this point in the history

  12. Tests

    @yger
    yger committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    b023161 View commit details
    Browse the repository at this point in the history

  13. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    9808e37 View commit details
    Browse the repository at this point in the history

  14. Testsg

    @yger
    yger committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    5f7ac5b View commit details
    Browse the repository at this point in the history

  15. Merge branch 'meta_merging' of github.com:yger/spikeinterface into me… 

    …ta_merging
    @yger
    yger committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    633d628 View commit details
    Browse the repository at this point in the history

  16. Cleaning benchmark

    @yger
    yger committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    6c0f90d View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. Cleaning benchmark

    @yger
    yger committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    6163fbe View commit details
    Browse the repository at this point in the history

  2. Merge branch 'meta_merging' of github.com:yger/spikeinterface into me… 

    …ta_merging
    @yger
    yger committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    8b033ec View commit details
    Browse the repository at this point in the history

  3. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    448d3cc View commit details
    Browse the repository at this point in the history

  4. WIP

    @yger
    yger committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    507df4c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'auto_merge_refactoring' into meta_merging

    @yger
    yger committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    fd25ca1 View commit details
    Browse the repository at this point in the history

  6. Refactoring

    @yger
    yger committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    831bb76 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'meta_merging' of github.com:yger/spikeinterface into me… 

    …ta_merging
    @yger
    yger committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    e01e0cc View commit details
    Browse the repository at this point in the history

  8. Naming circus 2

    @yger
    yger committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    622115f View commit details
    Browse the repository at this point in the history

  9. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    94d869a View commit details
    Browse the repository at this point in the history

  10. WIP

    @yger
    yger committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    42a3464 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'auto_merge_refactoring' into meta_merging

    @yger
    yger committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    eb69353 View commit details
    Browse the repository at this point in the history

  12. WIP

    @yger
    yger committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    0a5f32f View commit details
    Browse the repository at this point in the history

  13. WIPé

    @yger
    yger committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    e301e1a View commit details
    Browse the repository at this point in the history

  14. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    c6e71b8 View commit details
    Browse the repository at this point in the history

  15. Tests

    @yger
    yger committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    57c5b41 View commit details
    Browse the repository at this point in the history

  16. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    08da941 View commit details
    Browse the repository at this point in the history

  17. WIP

    @yger
    yger committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    0ec16e1 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'meta_merging' of github.com:yger/spikeinterface into me… 

    …ta_merging
    @yger
    yger committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    a5c6be3 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'meta_merging' of github.com:yger/spikeinterface into me… 

    …ta_merging
    @yger
    yger committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    528db42 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'meta_merging' of github.com:yger/spikeinterface into me… 

    …ta_merging
    @yger
    yger committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    2f06bb6 View commit details
    Browse the repository at this point in the history

  21. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    2bf61e9 View commit details
    Browse the repository at this point in the history

  22. Docs

    @yger
    yger committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    16dcfb8 View commit details
    Browse the repository at this point in the history

  23. Docs

    @yger
    yger committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    f6563cd View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. Fix the bug in benchmarks

    @yger
    yger committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    7c3e7ba View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    9d6c1f9 View commit details
    Browse the repository at this point in the history

  3. Fix

    @yger
    yger committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    48f65bb View commit details
    Browse the repository at this point in the history

  4. Merge branch 'meta_merging' of github.com:yger/spikeinterface into me… 

    …ta_merging
    @yger
    yger committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    ba6d835 View commit details
    Browse the repository at this point in the history

  5. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    43b383b View commit details
    Browse the repository at this point in the history

  6. Docs

    @yger
    yger committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    f003edc View commit details
    Browse the repository at this point in the history

  7. Merge branch 'meta_merging' of github.com:yger/spikeinterface into me… 

    …ta_merging
    @yger
    yger committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    9223bb2 View commit details
    Browse the repository at this point in the history

  8. Cleaning

    @yger
    yger committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    73b3a83 View commit details
    Browse the repository at this point in the history

  9. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    b296c81 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'auto_merge_refactoring' into meta_merging

    @yger
    yger committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    86a00af View commit details
    Browse the repository at this point in the history

  11. Benchmarking

    @yger
    yger committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    285f785 View commit details
    Browse the repository at this point in the history

  12. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    b34ad92 View commit details
    Browse the repository at this point in the history

  13. Benchmark

    @yger
    yger committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    9a9cf7d View commit details
    Browse the repository at this point in the history

  14. Benchmark

    @yger
    yger committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    de3a4a4 View commit details
    Browse the repository at this point in the history

  15. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    23c455e View commit details
    Browse the repository at this point in the history

  16. WIP

    @yger
    yger committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    60e98b4 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'meta_merging' of github.com:yger/spikeinterface into me… 

    …ta_merging
    @yger
    yger committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    27707fd View commit details
    Browse the repository at this point in the history

  18. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    e913a7b View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. Merge branch 'SpikeInterface:main' into meta_merging

    @yger
    yger authored Oct 31, 2024
    Configuration menu
    Copy the full SHA
    a396275 View commit details
    Browse the repository at this point in the history

  2. Sync with auto_merge

    @yger
    yger committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    392cdcc View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2024

  1. Merge branch 'SpikeInterface:main' into meta_merging

    @yger
    yger authored Nov 3, 2024
    Configuration menu
    Copy the full SHA
    33ae9eb View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2024

  1. Merge branch 'SpikeInterface:main' into meta_merging

    @yger
    yger authored Nov 4, 2024
    Configuration menu
    Copy the full SHA
    2f80b8d View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2024

  1. Merge branch 'SpikeInterface:main' into meta_merging

    @yger
    yger authored Nov 5, 2024
    Configuration menu
    Copy the full SHA
    42754ae View commit details
    Browse the repository at this point in the history

  2. WIP

    @yger
    yger committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    de4faf8 View commit details
    Browse the repository at this point in the history

  3. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    85cd163 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2024

  1. Merge branch 'SpikeInterface:main' into meta_merging

    @yger
    yger authored Nov 8, 2024
    Configuration menu
    Copy the full SHA
    3b76b5a View commit details
    Browse the repository at this point in the history

  2. To properly resolve the pairs

    @yger
    yger committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    397e54d View commit details
    Browse the repository at this point in the history

  3. Resolving merging while iterative auto_merge

    @yger
    yger committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    b584e67 View commit details
    Browse the repository at this point in the history

  4. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    7f4d2d8 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'extension_dependencies' into meta_merging

    @yger
    yger committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    d12f4ee View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2024

  1. Merge branch 'main' of github.com:spikeinterface/spikeinterface into … 

    …meta_merging
    @yger
    yger committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    27fed08 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2024

  1. Fixing tests

    @yger
    yger committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    1129b22 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2024

  1. Merge branch 'SpikeInterface:main' into meta_merging

    @yger
    yger authored Nov 29, 2024
    Configuration menu
    Copy the full SHA
    cdac4b9 View commit details
    Browse the repository at this point in the history

  2. Calibration with first benchmarks

    @yger
    yger committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    d310021 View commit details
    Browse the repository at this point in the history

  3. Removing correlograms

    @yger
    yger committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    097d46c View commit details
    Browse the repository at this point in the history

  4. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    e36c2b1 View commit details
    Browse the repository at this point in the history