Refactoring auto_merge#3435
Merged
alejoe91 merged 31 commits intoSpikeInterface:mainfrom Oct 31, 2024
Merged
Conversation
samuelgarcia
reviewed
Oct 7, 2024
samuelgarcia
reviewed
Oct 7, 2024
samuelgarcia
reviewed
Oct 7, 2024
for more information, see https://pre-commit.ci
for more information, see https://pre-commit.ci
…ce into auto_merge_refactoring
for more information, see https://pre-commit.ci
…ce into auto_merge_refactoring
for more information, see https://pre-commit.ci
alejoe91
requested changes
Oct 22, 2024
for more information, see https://pre-commit.ci
Co-authored-by: Alessio Buccino <alejoe9187@gmail.com>
for more information, see https://pre-commit.ci
alejoe91
reviewed
Oct 29, 2024
Co-authored-by: Alessio Buccino <alejoe9187@gmail.com>
Collaborator
Author
|
Forget what I said @samuelgarcia , I found the bug in the other PR, this one is working fine and good to merge on my side |
for more information, see https://pre-commit.ci
samuelgarcia
approved these changes
Oct 30, 2024
Member
|
@alejoe91 this is OK for me. |
alejoe91
approved these changes
Oct 31, 2024
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
4 participants
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.
This PR is made because of @samuelgarcia request. It will ease the design of recursive auto_merging functions, requiered by SC2 and better methods of automated merging. The idea is that one can provide preset (as before), and params are exposed as dictionary in auto_merges. The old behavior get_potential_auto_merges() is kept, but under the hood, we are now calling the new fonction. The fonction is based as much as possible on extensions.