-
Notifications
You must be signed in to change notification settings - Fork 63
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.
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
Add more conflict types to ConflictFinder
#238
base: develop
Are you sure you want to change the base?
Conversation
For anyone reviewing, please take a look at TODO comments I left and let me know what you think! |
The original code had some copy/paste (our bad!) but you may avoid it.
And just call it 6 times. |
About the TODO ideas: |
…facilitate conflict finding by address, not just SlotKey
@ZanCorDX thank you for all your suggestions. I implemented them and just pushed updated code! Went with a 2-layer |
Hi @ZanCorDX . Any more changes you would want to this? |
📝 Summary
Add more conflict types to
ConflictFinder
as per #226A brief overview of the changes:
ConflictFinder
, namelycombine_groups
- a utility fn to reuse codeConflictFinder.add_group_to_index
andConflictFinder.remove_group_from_index
to reuse code and improve readability;index
here means search index, or different member mappings ofConflictFinder
✅ I have completed the following steps:
make lint
make test